From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2020 22:18:40 +0000 (-0800)
Subject: Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9;p=linux.git

Merge tag 'staging-5.11-rc1' of git://git./linux/kernel/git/gregkh/staging

Pull staging / IIO driver updates from Greg KH:
 "Here is the big staging and IIO driver pull request for 5.11-rc1

  Lots of different things in here:

   - loads of driver updates

   - so many coding style cleanups

   - new IIO drivers

   - Android ION code is finally removed from the tree

   - wimax drivers are moved to staging on their way out of the kernel

  Nothing really exciting, just the constant grind of kernel development :)

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

* tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (341 commits)
  staging: olpc_dcon: Do not call platform_device_unregister() in dcon_probe()
  staging: most: Fix spelling mistake "tranceiver" -> "transceiver"
  staging: qlge: remove duplicate word in comment
  staging: comedi: mf6x4: Fix AI end-of-conversion detection
  staging: greybus: Add TODO item about modernizing the pwm code
  pinctrl: ralink: add a pinctrl driver for the rt2880 family
  dt-bindings: pinctrl: rt2880: add binding document
  staging: rtl8723bs: remove ELEMENT_ID enum
  staging: rtl8723bs: remove unused macros
  staging: rtl8723bs: replace EID_EXTCapability
  staging: rtl8723bs: replace EID_BSSIntolerantChlReport
  staging: rtl8723bs: replace EID_BSSCoexistence
  staging: rtl8723bs: replace _MME_IE_
  staging: rtl8723bs: replace _WAPI_IE_
  staging: rtl8723bs: replace _EXT_SUPPORTEDRATES_IE_
  staging: rtl8723bs: replace _ERPINFO_IE_
  staging: rtl8723bs: replace _CHLGETXT_IE_
  staging: rtl8723bs: replace _COUNTRY_IE_
  staging: rtl8723bs: replace _IBSS_PARA_IE_
  staging: rtl8723bs: replace _TIM_IE_
  ...
---

3db1a3fa98808aa90f95ec3e0fa2fc7abf28f5c9
diff --cc drivers/iio/trigger/iio-trig-sysfs.c
index e09e58072872c,10a3fd29362b8..0f6b512a5c37b
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@@ -160,7 -160,8 +160,7 @@@ static int iio_sysfs_trigger_probe(int 
  	t->trig->dev.parent = &iio_sysfs_trig_dev;
  	iio_trigger_set_drvdata(t->trig, t);
  
--	init_irq_work(&t->work, iio_sysfs_trigger_work);
 -	atomic_set(&t->work.flags, IRQ_WORK_HARD_IRQ);
++	t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
  
  	ret = iio_trigger_register(t->trig);
  	if (ret)
diff --cc drivers/staging/Kconfig
index 4d7a5ddf99929,c42708e60afc8..b22f73d7bfc42
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -94,8 -92,8 +92,6 @@@ source "drivers/staging/pi433/Kconfig
  
  source "drivers/staging/mt7621-pci/Kconfig"
  
- source "drivers/staging/mt7621-pinctrl/Kconfig"
 -source "drivers/staging/mt7621-pci-phy/Kconfig"
--
  source "drivers/staging/mt7621-dma/Kconfig"
  
  source "drivers/staging/ralink-gdma/Kconfig"
diff --cc drivers/staging/Makefile
index 89bde2370eee8,ebcc646d7b514..2245059e69c70
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -37,7 -36,7 +36,6 @@@ obj-$(CONFIG_GREYBUS)		+= greybus
  obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
  obj-$(CONFIG_PI433)		+= pi433/
  obj-$(CONFIG_PCI_MT7621)	+= mt7621-pci/
- obj-$(CONFIG_PINCTRL_RT2880)	+= mt7621-pinctrl/
 -obj-$(CONFIG_PCI_MT7621_PHY)	+= mt7621-pci-phy/
  obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/
  obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/
  obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/