diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2016-01-25 12:03:49 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-02-24 09:13:09 +0100 |
| commit | fb2e6b7b7b02ab35a9d5355a69097a6f60c69d38 (patch) | |
| tree | 89c4a62b5ae353c347116cb58ef112c79378a8cf /net/rfkill | |
| parent | d54bbaf45af04982d91b424ae0d2e8fe2fb78bd8 (diff) | |
| download | linux-fb2e6b7b7b02ab35a9d5355a69097a6f60c69d38.tar.bz2 | |
net: rfkill: gpio: remove rfkill_gpio_platform_data
No more users for it.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/Kconfig | 3 | ||||
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 598d374f6a35..868f1ad0415a 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -41,5 +41,4 @@ config RFKILL_GPIO default n help If you say yes here you get support of a generic gpio RFKILL - driver. The platform should fill in the appropriate fields in the - rfkill_gpio_platform_data structure and pass that to the driver. + driver. diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 1a9c0316aad1..76c01cbd56e3 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -27,8 +27,6 @@ #include <linux/acpi.h> #include <linux/gpio/consumer.h> -#include <linux/rfkill-gpio.h> - struct rfkill_gpio_data { const char *name; enum rfkill_type type; @@ -89,7 +87,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev, static int rfkill_gpio_probe(struct platform_device *pdev) { - struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data; struct rfkill_gpio_data *rfkill; struct gpio_desc *gpio; const char *type_name; @@ -111,11 +108,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev) ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill); if (ret) return ret; - } else if (pdata) { - rfkill->name = pdata->name; - rfkill->type = pdata->type; - } else { - return -ENODEV; } rfkill->clk = devm_clk_get(&pdev->dev, NULL); |