From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Feb 2017 20:14:01 +0000 (-0800)
Subject: Merge tag 'staging-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v4.11-rc1~116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=caa59428971d5ad81d19512365c9ba580d83268c;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'staging-4.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 patchsets for 4.11-rc1.

  We almost broke even this time around, with only a few thousand lines
  added overall, as we removed the old and obsolete i4l code, but added
  some new drivers for the RPi platform, as well as adding some new IIO
  drivers.

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

* tag 'staging-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (669 commits)
  Staging: vc04_services: Fix the "space prohibited" code style errors
  Staging: vc04_services: Fix the "wrong indent" code style errors
  staging: octeon: Use net_device_stats from struct net_device
  Staging: rtl8192u: ieee80211: ieee80211.h - style fix
  Staging: rtl8192u: ieee80211: ieee80211_tx.c - style fix
  Staging: rtl8192u: ieee80211: rtl819x_BAProc.c - style fix
  Staging: rtl8192u: ieee80211: ieee80211_module.c - style fix
  Staging: rtl8192u: ieee80211: rtl819x_TSProc.c - style fix
  Staging: rtl8192u: r8192U.h - style fix
  Staging: rtl8192u: r8192U_core.c - style fix
  Staging: rtl8192u: r819xU_cmdpkt.c - style fix
  staging: rtl8192u: blank lines aren't necessary before a close brace '}'
  staging: rtl8192u: Adding space after enum and struct definition
  staging: rtl8192u: Adding space after struct definition
  Staging: ks7010: Add required and preferred spaces around operators
  Staging: ks7010: ks*: Remove redundant blank lines
  Staging: ks7010: ks*: Add missing blank lines after declarations
  staging: visorbus, replace init_timer with setup_timer
  staging: vt6656: rxtx.c Removed multiple dereferencing
  staging: vt6656: Alignment match open parenthesis
  ...
---

caa59428971d5ad81d19512365c9ba580d83268c
diff --cc drivers/staging/greybus/gpio.c
index 51384bd,0eabfe1..ee5f998
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@@ -474,20 -474,17 +474,20 @@@ static void gb_gpio_set(struct gpio_chi
  	gb_gpio_set_value_operation(ggc, (u8)offset, !!value);
  }
  
- static int gb_gpio_set_config(struct gpio_chip *chip, unsigned offset,
 -static int gb_gpio_set_debounce(struct gpio_chip *chip, unsigned int offset,
 -				unsigned int debounce)
++static int gb_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
 +			      unsigned long config)
  {
  	struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
 -	u16 usec;
 +	u32 debounce;
  
 +	if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
 +		return -ENOTSUPP;
 +
 +	debounce = pinconf_to_config_argument(config);
  	if (debounce > U16_MAX)
  		return -EINVAL;
 -	usec = (u16)debounce;
  
 -	return gb_gpio_set_debounce_operation(ggc, (u8)offset, usec);
 +	return gb_gpio_set_debounce_operation(ggc, (u8)offset, (u16)debounce);
  }
  
  static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc)