Commit a0c1ca39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents e33a6d83 114eae3c

MAINTAINERS

+5 −28
Original line number Diff line number Diff line
@@ -9718,6 +9718,11 @@ L: platform-driver-x86@vger.kernel.org 
S:	Maintained

F:	drivers/platform/x86/gpd-pocket-fan.c









GPIB DRIVERS









M:	Dave Penkler <dpenkler@gmail.com>









S:	Maintained









F:	drivers/staging/gpib/

















GPIO ACPI SUPPORT









M:	Mika Westerberg <mika.westerberg@linux.intel.com>









M:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>








@@ -22135,17 +22140,6 @@ L:	linux-media@vger.kernel.org







S:	Maintained









F:	drivers/staging/media/atomisp/

















STAGING - FIELDBUS SUBSYSTEM









M:	Sven Van Asbroeck <TheSven73@gmail.com>









S:	Maintained









F:	drivers/staging/fieldbus/*









F:	drivers/staging/fieldbus/Documentation/

















STAGING - HMS ANYBUS-S BUS









M:	Sven Van Asbroeck <TheSven73@gmail.com>









S:	Maintained









F:	drivers/staging/fieldbus/anybuss/

















STAGING - INDUSTRIAL IO









M:	Jonathan Cameron <jic23@kernel.org>









L:	linux-iio@vger.kernel.org








@@ -22160,18 +22154,6 @@ L:	linux-tegra@vger.kernel.org







S:	Maintained









F:	drivers/staging/nvec/

















STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)









M:	Jens Frederich <jfrederich@gmail.com>









M:	Jon Nettleton <jon.nettleton@gmail.com>









S:	Maintained









W:	http://wiki.laptop.org/go/DCON









F:	drivers/staging/olpc_dcon/

















STAGING - REALTEK RTL8712U DRIVERS









M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.









S:	Odd Fixes









F:	drivers/staging/rtl8712/

















STAGING - SEPS525 LCD CONTROLLER DRIVERS









M:	Michael Hennerich <michael.hennerich@analog.com>









L:	linux-fbdev@vger.kernel.org








@@ -22187,11 +22169,6 @@ L:	linux-fbdev@vger.kernel.org







S:	Maintained









F:	drivers/staging/sm750fb/

















STAGING - VIA VT665X DRIVERS









M:	Philipp Hortmann <philipp.g.hortmann@gmail.com>









S:	Odd Fixes









F:	drivers/staging/vt665?/

















STAGING SUBSYSTEM









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









L:	linux-staging@lists.linux.dev

























drivers/staging/Kconfig



+2
−14






























Original line number
Diff line number
Diff line







@@ -24,20 +24,10 @@ menuconfig STAGING

















if STAGING



















source "drivers/staging/olpc_dcon/Kconfig"



















source "drivers/staging/rtl8723bs/Kconfig"



















source "drivers/staging/rtl8712/Kconfig"



















source "drivers/staging/rts5208/Kconfig"



















source "drivers/staging/octeon/Kconfig"



















source "drivers/staging/vt6655/Kconfig"



















source "drivers/staging/vt6656/Kconfig"



















source "drivers/staging/iio/Kconfig"



















source "drivers/staging/sm750fb/Kconfig"








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

















source "drivers/staging/media/Kconfig"



















source "drivers/staging/gdm724x/Kconfig"



















source "drivers/staging/fbtft/Kconfig"



















source "drivers/staging/most/Kconfig"








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

















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



















source "drivers/staging/fieldbus/Kconfig"



















source "drivers/staging/vme_user/Kconfig"



















source "drivers/staging/gpib/Kconfig"



















endif # STAGING
























drivers/staging/Makefile



+1
−7






























Original line number
Diff line number
Diff line







@@ -2,21 +2,15 @@







# Makefile for staging directory



















obj-y				+= media/









obj-$(CONFIG_FB_OLPC_DCON)	+= olpc_dcon/









obj-$(CONFIG_RTL8723BS)		+= rtl8723bs/









obj-$(CONFIG_R8712U)		+= rtl8712/









obj-$(CONFIG_RTS5208)		+= rts5208/









obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/









obj-$(CONFIG_VT6655)		+= vt6655/









obj-$(CONFIG_VT6656)		+= vt6656/









obj-$(CONFIG_VME_BUS)		+= vme_user/









obj-$(CONFIG_IIO)		+= iio/









obj-$(CONFIG_FB_SM750)		+= sm750fb/









obj-$(CONFIG_MFD_NVEC)		+= nvec/









obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/









obj-$(CONFIG_FB_TFT)		+= fbtft/









obj-$(CONFIG_MOST)		+= most/









obj-$(CONFIG_GREYBUS)		+= greybus/









obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/









obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/









obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/








obj-$(CONFIG_GPIB)	 	+= gpib/
























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



+1
−1






























Original line number
Diff line number
Diff line







@@ -919,7 +919,7 @@ static struct platform_driver axis_fifo_driver = {







		.of_match_table	= axis_fifo_of_match,









	},









	.probe		= axis_fifo_probe,









	.remove_new	= axis_fifo_remove,









	.remove		= axis_fifo_remove,









};



















static int __init axis_fifo_init(void)
































drivers/staging/fbtft/fbtft.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -330,7 +330,7 @@ static struct platform_driver fbtft_driver_platform_driver = {             \







		.of_match_table = dt_ids,                                  \









	},                                                                 \









	.probe  = fbtft_driver_probe_pdev,                                 \









	.remove_new = fbtft_driver_remove_pdev,				   \









	.remove = fbtft_driver_remove_pdev,				   \









};                                                                         \









									   \









static int __init fbtft_driver_module_init(void)                           \