Commit be81389c authored May 22, 2024 by Linus Torvalds

Merge tag 'staging-6.10-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.10-rc1. Not a lot
  of cleanups happening this kernel release, intern applications must be
  out of sync at the moment. But we did delete two drivers, wlan-ng and
  pi433, as they are no longer in use and the developers involved wanted
  them just gone entirely, allowing us to drop 19k lines from the tree.

  Other than the normal coding style cleanups here, there has been a lot
  of work on the vc04_services code, with the intent to finally get that
  out of staging hopefully soon. It's getting closer, which is nice to
  see.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (98 commits)
  staging: pi433: Remove unused driver
  staging: vchiq_core: Add missing blank lines
  staging: vchiq_core: Drop unnecessary blank lines
  staging: vchiq_core: Add parentheses to VCHIQ_MSG_SRCPORT
  staging: vchiq_core: Use printk messages for devices
  staging: vchiq_arm: Drop unnecessary NULL check
  staging: vc04_services: Delete unnecessary NULL check
  staging: vc04_services: vchiq_arm: Fix NULL ptr dereferences
  Staging: rtl8192e: Rename variable DssCCk
  Staging: rtl8192e: Rename variable ExtHTCapInfo
  Staging: rtl8192e: Rename variable MPDUDensity
  Staging: rtl8192e: Rename variable MaxRxAMPDUFactor
  Staging: rtl8192e: Rename variable MaxAMSDUSize
  Staging: rtl8192e: Rename variable DelayBA
  Staging: rtl8192e: Rename variable RxSTBC
  Staging: rtl8192e: Rename variable TxSTBC
  Staging: rtl8192e: Rename variable GreenField
  Staging: rtl8192e: Rename variable ShortGI20Mhz
  Staging: rtl8192e: Rename variable ShortGI40Mhz
  Staging: rtl8192e: Rename variable MimoPwrSave
  ...

parents f6b8e86b eb563dc7

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -21241,7 +21241,7 @@ S: Maintained
		F: drivers/staging/sm750fb/

		STAGING - VIA VT665X DRIVERS
		M: Forest Bond <forest@alittletooquiet.net>
		M: Philipp Hortmann <philipp.g.hortmann@gmail.com>
		S: Odd Fixes
		F: drivers/staging/vt665?/

drivers/staging/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ menuconfig STAGING

		if STAGING

		source "drivers/staging/wlan-ng/Kconfig"

		source "drivers/staging/olpc_dcon/Kconfig"

		source "drivers/staging/rtl8192e/Kconfig"
		@@ -62,8 +60,6 @@ source "drivers/staging/greybus/Kconfig"

		source "drivers/staging/vc04_services/Kconfig"

		source "drivers/staging/pi433/Kconfig"

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

		source "drivers/staging/fieldbus/Kconfig"

drivers/staging/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		# Makefile for staging directory

		obj-y += media/
		obj-$(CONFIG_PRISM2_USB) += wlan-ng/
		obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
		obj-$(CONFIG_RTL8192E) += rtl8192e/
		obj-$(CONFIG_RTL8723BS) += rtl8723bs/
		@@ -21,6 +20,5 @@ obj-$(CONFIG_MOST) += most/
		obj-$(CONFIG_KS7010) += ks7010/
		obj-$(CONFIG_GREYBUS) += greybus/
		obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
		obj-$(CONFIG_PI433) += pi433/
		obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
		obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/

drivers/staging/fbtft/fb_seps525.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -16,11 +16,10 @@
		* GNU General Public License for more details.
		*/

		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/gpio.h>
		#include <linux/bits.h>
		#include <linux/delay.h>
		#include <linux/init.h>
		#include <linux/module.h>

		#include "fbtft.h"

drivers/staging/greybus/arche-apb-ctrl.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,7 @@ static const struct of_device_id arche_apb_ctrl_of_match[] = {
		{ .compatible = "usbffff,2", },
		{ },
		};
		MODULE_DEVICE_TABLE(of, arche_apb_ctrl_of_match);

		static struct platform_driver arche_apb_ctrl_device_driver = {
		.probe = arche_apb_ctrl_probe,