Skip to content

Commit fb2e6b7

Browse files
Heikki Krogerusjmberg-intel
authored andcommitted
net: rfkill: gpio: remove rfkill_gpio_platform_data
No more users for it. Signed-off-by: Heikki Krogerus <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
1 parent d54bbaf commit fb2e6b7

File tree

3 files changed

+1
-47
lines changed

3 files changed

+1
-47
lines changed

include/linux/rfkill-gpio.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

net/rfkill/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,4 @@ config RFKILL_GPIO
4141
default n
4242
help
4343
If you say yes here you get support of a generic gpio RFKILL
44-
driver. The platform should fill in the appropriate fields in the
45-
rfkill_gpio_platform_data structure and pass that to the driver.
44+
driver.

net/rfkill/rfkill-gpio.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#include <linux/acpi.h>
2828
#include <linux/gpio/consumer.h>
2929

30-
#include <linux/rfkill-gpio.h>
31-
3230
struct rfkill_gpio_data {
3331
const char *name;
3432
enum rfkill_type type;
@@ -89,7 +87,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
8987

9088
static int rfkill_gpio_probe(struct platform_device *pdev)
9189
{
92-
struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
9390
struct rfkill_gpio_data *rfkill;
9491
struct gpio_desc *gpio;
9592
const char *type_name;
@@ -111,11 +108,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
111108
ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill);
112109
if (ret)
113110
return ret;
114-
} else if (pdata) {
115-
rfkill->name = pdata->name;
116-
rfkill->type = pdata->type;
117-
} else {
118-
return -ENODEV;
119111
}
120112

121113
rfkill->clk = devm_clk_get(&pdev->dev, NULL);

0 commit comments

Comments
 (0)