From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jul 2019 22:36:02 +0000 (-0700)
Subject: Merge tag 'staging-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v5.4-rc1~602
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e786741ff1b52769b044b7f4407f39cd13ee5d2d;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull staging and IIO driver updates from Greg KH:
 "Here is the big Staging and IIO driver update for 5.3-rc1.

  Lots of new IIO drivers are in here, along with loads of tiny staging
  driver cleanups and fixes. Overall we almost break even with the same
  lines added as removed.

  Full details are in the shortlog, they are too large to list here.

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

* tag 'staging-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (608 commits)
  staging: kpc2000: simplify comparison to NULL in fileops.c
  staging: kpc2000: simplify comparison to NULL in dma.c
  staging: kpc2000: simplify comparison to NULL in kpc2000_spi.c
  staging: rtl8723bs: hal: remove redundant assignment to packetType
  staging: rtl8723bs: Change return type of hal_btcoex_IsBtDisabled()
  staging: rtl8723bs: Remove rtw_btcoex_DisplayBtCoexInfo()
  staging: rtl8723bs: Remove function rtw_btcoex_GetDBG()
  staging: rtl8723bs: Remove function rtw_btcoex_SetDBG()
  staging: rtl8723bs: Remove rtw_btcoex_IsBTCoexCtrlAMPDUSize()
  staging: rtl8723bs: Remove rtw_btcoex_BtInfoNotify()
  staging: rtl8723bs: Remove rtw_btcoex_ScanNotify()
  staging: rtl8723bs: Remove rtw_btcoex_SetSingleAntPath()
  staging: rtl8723bs: Remove rtw_btcoex_SetPGAntNum()
  staging: rtl8192e: remove redundant initialization of rtstatus
  staging: rtl8723bs: Remove rtw_btcoex_GetRaMask()
  staging: rtl8723bs: Remove rtw_btcoex_SetChipType()
  staging: rtl8723bs: Remove rtw_btcoex_ConnectNotify()
  staging: rtl8723bs: Remove rtw_btcoex_SetBTCoexist()
  staging: rtl8723bs: Remove rtw_btcoex_IsBtDisabled()
  staging: rtl8723bs: Remove rtw_btcoex_IsBtControlLps()
  ...
---

e786741ff1b52769b044b7f4407f39cd13ee5d2d
diff --cc MAINTAINERS
index 9b4a3e7,c0a02dc..30e9104
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -916,8 -910,17 +917,17 @@@ S:	Supporte
  F:	drivers/iio/adc/ad7768-1.c
  F:	Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
  
+ ANALOG DEVICES INC AD7780 DRIVER
+ M:	Michael Hennerich <Michael.Hennerich@analog.com>
+ M:	Renato Lui Geh <renatogeh@gmail.com>
+ L:	linux-iio@vger.kernel.org
+ W:	http://ez.analog.com/community/linux-device-drivers
+ S:	Supported
+ F:	drivers/iio/adc/ad7780.c
+ F:	Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
+ 
  ANALOG DEVICES INC AD9389B DRIVER
 -M:	Hans Verkuil <hans.verkuil@cisco.com>
 +M:	Hans Verkuil <hverkuil-cisco@xs4all.nl>
  L:	linux-media@vger.kernel.org
  S:	Maintained
  F:	drivers/media/i2c/ad9389b*
diff --cc drivers/iio/humidity/dht11.c
index 4e22b3c,f5128d8..b459600e
--- a/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@@ -177,9 -176,9 +176,9 @@@ static irqreturn_t dht11_handle_irq(in
  
  	/* TODO: Consider making the handler safe for IRQ sharing */
  	if (dht11->num_edges < DHT11_EDGES_PER_READ && dht11->num_edges >= 0) {
 -		dht11->edges[dht11->num_edges].ts = ktime_get_boot_ns();
 +		dht11->edges[dht11->num_edges].ts = ktime_get_boottime_ns();
  		dht11->edges[dht11->num_edges++].value =
- 						gpio_get_value(dht11->gpio);
+ 						gpiod_get_value(dht11->gpiod);
  
  		if (dht11->num_edges >= DHT11_EDGES_PER_READ)
  			complete(&dht11->completion);