Skip to content

Commit a0c1ca3

Browse files
committed
Merge tag 'staging-6.13-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 changes for 6.13-rc1. Lots of changes this merge cycle, drivers removed and drivers added. Highlights include: - removals of the following staging drivers due to no forward progress and no one having either the hardware or the time/energy to deal with them anymore: - fieldbus - gdm724x - olpc_dcon - rtl8712 - rts5208 - vt6655 - vt6656 If anyone has this hardware and wants to work on the drivers, it can be an easy revert to get them back. - addition of the gpib driver subsystem. Lots of drivers for really old and semi-old interfaces to lab equipments. We expect lots of churn in these drivers as they get cleaned up to "working" order. These were added at the request of a user and the maintainer/author of them is helping out with the effort - loads and loads of tiny coding style cleanups for almost all staging drivers. Too many to list, see the shortlog for details. All of these have been in linux-next for a very long time with no reported issues" * tag 'staging-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (216 commits) Staging: gpib: gpib_os.c - Remove unnecessary OOM message staging: gpib: avoid unintended sign extension staging: vchiq_debugfs: Use forward declarations staging: vchiq_core: Rectify header include for vchiq_dump_state() staging: vc04_services: Cleanup TODO entry staging: most: Remove TODO contact information staging: rtl8723bs: Remove TODO contact information staging: sm750fb: Remove TODO contact information staging: iio: Remove TODO file staging: greybus: uart: Fix atomicity violation in get_serial_info() staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader staging: rtl8723bs: Remove unused function hal_EfusePgCheckAvailableAddr staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteHeader staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT ...
2 parents e33a6d8 + 114eae3 commit a0c1ca3

File tree

363 files changed

+29657
-77272
lines changed

Some content is hidden

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

363 files changed

+29657
-77272
lines changed

MAINTAINERS

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9718,6 +9718,11 @@ L: platform-driver-x86@vger.kernel.org
97189718
S: Maintained
97199719
F: drivers/platform/x86/gpd-pocket-fan.c
97209720

9721+
GPIB DRIVERS
9722+
M: Dave Penkler <dpenkler@gmail.com>
9723+
S: Maintained
9724+
F: drivers/staging/gpib/
9725+
97219726
GPIO ACPI SUPPORT
97229727
M: Mika Westerberg <mika.westerberg@linux.intel.com>
97239728
M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -22135,17 +22140,6 @@ L: linux-media@vger.kernel.org
2213522140
S: Maintained
2213622141
F: drivers/staging/media/atomisp/
2213722142

22138-
STAGING - FIELDBUS SUBSYSTEM
22139-
M: Sven Van Asbroeck <TheSven73@gmail.com>
22140-
S: Maintained
22141-
F: drivers/staging/fieldbus/*
22142-
F: drivers/staging/fieldbus/Documentation/
22143-
22144-
STAGING - HMS ANYBUS-S BUS
22145-
M: Sven Van Asbroeck <TheSven73@gmail.com>
22146-
S: Maintained
22147-
F: drivers/staging/fieldbus/anybuss/
22148-
2214922143
STAGING - INDUSTRIAL IO
2215022144
M: Jonathan Cameron <jic23@kernel.org>
2215122145
L: linux-iio@vger.kernel.org
@@ -22160,18 +22154,6 @@ L: linux-tegra@vger.kernel.org
2216022154
S: Maintained
2216122155
F: drivers/staging/nvec/
2216222156

22163-
STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
22164-
M: Jens Frederich <jfrederich@gmail.com>
22165-
M: Jon Nettleton <jon.nettleton@gmail.com>
22166-
S: Maintained
22167-
W: http://wiki.laptop.org/go/DCON
22168-
F: drivers/staging/olpc_dcon/
22169-
22170-
STAGING - REALTEK RTL8712U DRIVERS
22171-
M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
22172-
S: Odd Fixes
22173-
F: drivers/staging/rtl8712/
22174-
2217522157
STAGING - SEPS525 LCD CONTROLLER DRIVERS
2217622158
M: Michael Hennerich <michael.hennerich@analog.com>
2217722159
L: linux-fbdev@vger.kernel.org
@@ -22187,11 +22169,6 @@ L: linux-fbdev@vger.kernel.org
2218722169
S: Maintained
2218822170
F: drivers/staging/sm750fb/
2218922171

22190-
STAGING - VIA VT665X DRIVERS
22191-
M: Philipp Hortmann <philipp.g.hortmann@gmail.com>
22192-
S: Odd Fixes
22193-
F: drivers/staging/vt665?/
22194-
2219522172
STAGING SUBSYSTEM
2219622173
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2219722174
L: linux-staging@lists.linux.dev

drivers/staging/Kconfig

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,10 @@ menuconfig STAGING
2424

2525
if STAGING
2626

27-
source "drivers/staging/olpc_dcon/Kconfig"
28-
2927
source "drivers/staging/rtl8723bs/Kconfig"
3028

31-
source "drivers/staging/rtl8712/Kconfig"
32-
33-
source "drivers/staging/rts5208/Kconfig"
34-
3529
source "drivers/staging/octeon/Kconfig"
3630

37-
source "drivers/staging/vt6655/Kconfig"
38-
39-
source "drivers/staging/vt6656/Kconfig"
40-
4131
source "drivers/staging/iio/Kconfig"
4232

4333
source "drivers/staging/sm750fb/Kconfig"
@@ -46,8 +36,6 @@ source "drivers/staging/nvec/Kconfig"
4636

4737
source "drivers/staging/media/Kconfig"
4838

49-
source "drivers/staging/gdm724x/Kconfig"
50-
5139
source "drivers/staging/fbtft/Kconfig"
5240

5341
source "drivers/staging/most/Kconfig"
@@ -58,8 +46,8 @@ source "drivers/staging/vc04_services/Kconfig"
5846

5947
source "drivers/staging/axis-fifo/Kconfig"
6048

61-
source "drivers/staging/fieldbus/Kconfig"
62-
6349
source "drivers/staging/vme_user/Kconfig"
6450

51+
source "drivers/staging/gpib/Kconfig"
52+
6553
endif # STAGING

drivers/staging/Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
# Makefile for staging directory
33

44
obj-y += media/
5-
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
65
obj-$(CONFIG_RTL8723BS) += rtl8723bs/
7-
obj-$(CONFIG_R8712U) += rtl8712/
8-
obj-$(CONFIG_RTS5208) += rts5208/
96
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
10-
obj-$(CONFIG_VT6655) += vt6655/
11-
obj-$(CONFIG_VT6656) += vt6656/
127
obj-$(CONFIG_VME_BUS) += vme_user/
138
obj-$(CONFIG_IIO) += iio/
149
obj-$(CONFIG_FB_SM750) += sm750fb/
1510
obj-$(CONFIG_MFD_NVEC) += nvec/
16-
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
1711
obj-$(CONFIG_FB_TFT) += fbtft/
1812
obj-$(CONFIG_MOST) += most/
1913
obj-$(CONFIG_GREYBUS) += greybus/
2014
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
2115
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
22-
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
16+
obj-$(CONFIG_GPIB) += gpib/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ static struct platform_driver axis_fifo_driver = {
919919
.of_match_table = axis_fifo_of_match,
920920
},
921921
.probe = axis_fifo_probe,
922-
.remove_new = axis_fifo_remove,
922+
.remove = axis_fifo_remove,
923923
};
924924

925925
static int __init axis_fifo_init(void)

drivers/staging/fbtft/fbtft.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static struct platform_driver fbtft_driver_platform_driver = { \
330330
.of_match_table = dt_ids, \
331331
}, \
332332
.probe = fbtft_driver_probe_pdev, \
333-
.remove_new = fbtft_driver_remove_pdev, \
333+
.remove = fbtft_driver_remove_pdev, \
334334
}; \
335335
\
336336
static int __init fbtft_driver_module_init(void) \

drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev

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

drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev

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

drivers/staging/fieldbus/Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt

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

drivers/staging/fieldbus/Documentation/fieldbus_dev.txt

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

drivers/staging/fieldbus/Kconfig

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

0 commit comments

Comments
 (0)