Commit 22ef1219 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver updates from Greg KH:
 "Here's the big set of staging driver updates for 5.17-rc1

  Nothing major in here at all, just lots and lots of tiny cleanups.
  Overall more code was removed than added, which is always nice, but
  not a huge change.

  Majority of the work happened in the r8188eu driver, that had hundreds
  of cleanups happen on it, but almost all other staging drivers had
  cleanups as well. No new functionality was added, cleanups only.

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

* tag 'staging-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (308 commits)
  staging: r8188eu: rename camelcase variable uintPeerChannel
  staging: r8188eu: make BW20_24G_Diff a 1-D array
  staging: r8188eu: make OFDM_24G_Diff a 1-D array
  staging: r8188eu: BW40_24G_Diff is set but not used
  staging: r8188eu: CCK_24G_Diff is set but not used
  staging: r8188eu: make Index24G_BW40_Base a 1-D array
  staging: r8188eu: make Index24G_CCK_Base a 1-D array
  staging: r8188eu: rfPath is always 0
  staging: r8188eu: remove unneeded parameter from rtl8188e_SetHalODMVar
  staging: pi433: add comment to rx_lock mutex definition
  staging: pi433: fix frequency deviation check
  staging: vc04_services: rename BM2835 to BCM2835 in headers comments
  staging: vc04_services: rename string literal containing bm2835_* to bcm2835*_
  staging: vc04_services: rename variables containing bm2835_* to bcm2835_*
  staging: vc04_services: rename functions containing bm2835_* to bcm2835_*
  staging: vc04_services: rename structures bm2835_mmal_dev and bm2835_mmal_v4l2_ctrl
  staging: greybus: audio: Check null pointer
  staging: r8188eu: add spaces around P2P_AP_P2P_CH_SWITCH_PROCESS_WK
  staging: r8188eu: turbo scan is always off for r8188eu
  staging: r8188eu: cmd_issued_cnt is set but not used
  ...
parents 6dc69d3d fa783154

drivers/staging/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -84,10 +84,6 @@ source "drivers/staging/vc04_services/Kconfig" 


source "drivers/staging/pi433/Kconfig"



source "drivers/staging/mt7621-dma/Kconfig"



source "drivers/staging/ralink-gdma/Kconfig"



source "drivers/staging/mt7621-dts/Kconfig"



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

drivers/staging/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ obj-$(CONFIG_KS7010) += ks7010/ 
obj-$(CONFIG_GREYBUS)		+= greybus/

obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/

obj-$(CONFIG_PI433)		+= pi433/

obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/

obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/

obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/

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

obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/

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

+3 −8
Original line number Diff line number Diff line
@@ -809,7 +809,6 @@ static int axis_fifo_parse_dt(struct axis_fifo *fifo) 


static int axis_fifo_probe(struct platform_device *pdev)

{

	struct resource *r_irq; /* interrupt resources */

	struct resource *r_mem; /* IO mem resources */

	struct device *dev = &pdev->dev; /* OS device (from device tree) */

	struct axis_fifo *fifo = NULL;
@@ -882,16 +881,12 @@ static int axis_fifo_probe(struct platform_device *pdev) 
	 */



	/* get IRQ resource */

	r_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!r_irq) {

		dev_err(fifo->dt_device, "no IRQ found for 0x%pa\n",

			&r_mem->start);

		rc = -EIO;

	rc = platform_get_irq(pdev, 0);

	if (rc < 0)

		goto err_initial;

	}



	/* request IRQ */

	fifo->irq = r_irq->start;

	fifo->irq = rc;

	rc = devm_request_irq(fifo->dt_device, fifo->irq, &axis_fifo_irq, 0,

			      DRIVER_NAME, fifo);

	if (rc) {

drivers/staging/fbtft/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -200,9 +200,3 @@ config FB_TFT_UPD161704 
	depends on FB_TFT

	help

	  Generic Framebuffer support for uPD161704
 


config FB_TFT_WATTEROTT

	tristate "FB driver for the WATTEROTT LCD Controller"

	depends on FB_TFT

	help

	  Generic Framebuffer support for WATTEROTT

drivers/staging/fbtft/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -36,4 +36,3 @@ obj-$(CONFIG_FB_TFT_TLS8204) += fb_tls8204.o 
obj-$(CONFIG_FB_TFT_UC1611)      += fb_uc1611.o

obj-$(CONFIG_FB_TFT_UC1701)      += fb_uc1701.o

obj-$(CONFIG_FB_TFT_UPD161704)   += fb_upd161704.o
 
obj-$(CONFIG_FB_TFT_WATTEROTT)   += fb_watterott.o