Commit 723c188d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.0-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 patches for 6.0-rc1.

  Another round where we removed more lines of code than added, always a
  nice progression. Some of that came from the movement of the vme code
  back into staging, and removal of some other of the vme driver code as
  there are no known users and it is very obsolete and unmaintained. It
  can be added back easily if someone offers to maintain it.

  Other than that this merge has lots of little things:

   - huge cleanups for r8188eu driver

   - minor cleanups for other wifi drivers

   - tiny loop fixes for greybus code

   - other small coding style fixes

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

* tag 'staging-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (191 commits)
  staging: r8188eu: fix potential uninitialised variable use in rtw_pwrctrl.c
  staging: r8188eu: remove initializer from ret in rtw_pwr_wakeup
  staging: vt6655: Convert macro vt6655_mac_clear_stck_ds to function
  staging: vt6655: Rename MACvClearStckDS
  staging: fbtft: core: set smem_len before fb_deferred_io_init call
  staging: r8188eu: convert rtw_pwr_wakeup to correct error code semantics
  staging: r8188eu: make dump_chip_info() static
  staging: r8188eu: remove DoReserved prototype
  staging: r8188eu: remove OnAtim prototype
  staging: r8188eu: remove SetHwReg8188EU()
  staging: r8188eu: make update_TSF() and correct_TSF() static
  staging: r8188eu: remove unused parameter from update_TSF()
  staging: r8188eu: remove unused parameter from correct_TSF()
  staging: r8188eu: remove HW_VAR_SET_OPMODE from SetHwReg8188EU()
  staging: pi433: remove duplicated comments
  staging: qlge: refine variable name
  staging: vt6655: Convert macro vt6655_mac_word_reg_bits_off to function
  staging: vt6655: Convert macro vt6655_mac_reg_bits_off to function
  staging: vt6655: Convert macro vt6655_mac_word_reg_bits_on to function
  staging: vt6655: Convert macro vt6655_mac_reg_bits_on to function
  ...
parents 78acd4ca 87f600af

Documentation/driver-api/vme.rst

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ The function :c:func:`vme_bus_num` returns the bus ID of the provided bridge. 
VME API

-------



.. kernel-doc:: include/linux/vme.h

.. kernel-doc:: drivers/staging/vme_user/vme.h

   :internal:



.. kernel-doc:: drivers/vme/vme.c

.. kernel-doc:: drivers/staging/vme_user/vme.c

   :export:

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -19261,6 +19261,7 @@ F: drivers/staging/olpc_dcon/ 
STAGING - REALTEK RTL8188EU DRIVERS

M:	Larry Finger <Larry.Finger@lwfinger.net>

M:	Phillip Potter <phil@philpotter.co.uk>

R:	Pavel Skripkin <paskripkin@gmail.com>

S:	Supported

F:	drivers/staging/r8188eu/








@@ -21580,12 +21581,10 @@ M:	Martyn Welch <martyn@welchs.me.uk>







M:	Manohar Vanga <manohar.vanga@gmail.com>









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









L:	linux-kernel@vger.kernel.org









S:	Maintained









S:	Odd fixes









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git









F:	Documentation/driver-api/vme.rst









F:	drivers/staging/vme_user/









F:	drivers/vme/









F:	include/linux/vme*

















VM SOCKETS (AF_VSOCK)









M:	Stefano Garzarella <sgarzare@redhat.com>

























drivers/Kconfig



+0
−2






























Original line number
Diff line number
Diff line







@@ -183,8 +183,6 @@ source "drivers/iio/Kconfig"

















source "drivers/ntb/Kconfig"



















source "drivers/vme/Kconfig"



















source "drivers/pwm/Kconfig"



















source "drivers/irqchip/Kconfig"
































drivers/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -165,7 +165,6 @@ obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/







obj-$(CONFIG_EXTCON)		+= extcon/









obj-$(CONFIG_MEMORY)		+= memory/









obj-$(CONFIG_IIO)		+= iio/









obj-$(CONFIG_VME_BUS)		+= vme/









obj-$(CONFIG_IPACK_BUS)		+= ipack/









obj-$(CONFIG_NTB)		+= ntb/









obj-$(CONFIG_POWERCAP)		+= powercap/
































drivers/staging/fbtft/fb_ssd1351.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -196,8 +196,7 @@ static int update_onboard_backlight(struct backlight_device *bd)







		      "%s: power=%d, fb_blank=%d\n",









		      __func__, bd->props.power, bd->props.fb_blank);



















	on = (bd->props.power == FB_BLANK_UNBLANK) &&









	     (bd->props.fb_blank == FB_BLANK_UNBLANK);









	on = !backlight_is_blank(bd);









	/* Onboard backlight connected to GPIO0 on SSD1351, GPIO1 unused */









	write_reg(par, 0xB5, on ? 0x03 : 0x02);