Skip to content

Commit 0a59b3f

Browse files
committed
Merge tag 'staging-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the big set of Staging driver cleanups for 6.9-rc1. Nothing major in here, lots of small coding style cleanups for most drivers, and the removal of some obsolete hardare (the emxx_udc and some drivers/staging/board/ files). All of these have been in linux-next for a long time with no reported issues" * tag 'staging-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (122 commits) staging: greybus: Replaces directive __attribute__((packed)) by __packed as suggested by checkpatch staging: greybus: Replace __attribute__((packed)) by __packed in various instances Staging: rtl8192e: Rename function GetHalfNmodeSupportByAPsHandler() Staging: rtl8192e: Rename function rtllib_FlushRxTsPendingPkts() Staging: rtl8192e: Rename goto OnADDBARsp_Reject Staging: rtl8192e: Rename goto OnADDBAReq_Fail Staging: rtl8192e: Rename function rtllib_send_ADDBARsp() Staging: rtl8192e: Rename function rtllib_send_ADDBAReq() Staging: rtl8192e: Rename variable TxRxSelect Staging: rtl8192e: Fix 5 chckpatch alignment warnings in rtl819x_BAProc.c Staging: rtl8192e: Rename function MgntQuery_MgntFrameTxRate Staging: rtl8192e: Rename boolean variable bHalfWirelessN24GMode Staging: rtl8192e: Rename reference AllowAllDestAddrHandler Staging: rtl8192e: Rename varoable asSta Staging: rtl8192e: Rename varoable osCcxVerNum Staging: rtl8192e: Rename variable CcxAironetBuf Staging: rtl8192e: Rename variable osCcxAironetIE Staging: rtl8192e: Rename variable AironetIeOui Staging: rtl8192e: Rename variable asRsn Staging: rtl8192e: Rename variable CcxVerNumBuf ...
2 parents 3bcb0bf + 68bb540 commit 0a59b3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+537
-4820
lines changed

drivers/staging/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,10 @@ source "drivers/staging/iio/Kconfig"
4646

4747
source "drivers/staging/sm750fb/Kconfig"
4848

49-
source "drivers/staging/emxx_udc/Kconfig"
50-
5149
source "drivers/staging/nvec/Kconfig"
5250

5351
source "drivers/staging/media/Kconfig"
5452

55-
source "drivers/staging/board/Kconfig"
56-
5753
source "drivers/staging/gdm724x/Kconfig"
5854

5955
source "drivers/staging/fbtft/Kconfig"

drivers/staging/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ obj-$(CONFIG_VT6656) += vt6656/
1414
obj-$(CONFIG_VME_BUS) += vme_user/
1515
obj-$(CONFIG_IIO) += iio/
1616
obj-$(CONFIG_FB_SM750) += sm750fb/
17-
obj-$(CONFIG_USB_EMXX) += emxx_udc/
1817
obj-$(CONFIG_MFD_NVEC) += nvec/
19-
obj-$(CONFIG_STAGING_BOARD) += board/
2018
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
2119
obj-$(CONFIG_FB_TFT) += fbtft/
2220
obj-$(CONFIG_MOST) += most/

drivers/staging/axis-fifo/axis-fifo.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,9 @@ static ssize_t sysfs_read(struct device *dev, char *buf,
165165
{
166166
struct axis_fifo *fifo = dev_get_drvdata(dev);
167167
unsigned int read_val;
168-
unsigned int len;
169-
char tmp[32];
170168

171169
read_val = ioread32(fifo->base_addr + addr_offset);
172-
len = snprintf(tmp, sizeof(tmp), "0x%x\n", read_val);
173-
memcpy(buf, tmp, len);
174-
175-
return len;
170+
return sysfs_emit(buf, "0x%x\n", read_val);
176171
}
177172

178173
static ssize_t isr_store(struct device *dev, struct device_attribute *attr,

drivers/staging/board/Kconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

drivers/staging/board/Makefile

Lines changed: 0 additions & 4 deletions
This file was deleted.

drivers/staging/board/TODO

Lines changed: 0 additions & 2 deletions
This file was deleted.

drivers/staging/board/armadillo800eva.c

Lines changed: 0 additions & 88 deletions
This file was deleted.

drivers/staging/board/board.c

Lines changed: 0 additions & 204 deletions
This file was deleted.

0 commit comments

Comments
 (0)