UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: rfkill: gpio: remove unused and obsolete platform parameters 

After upgrading to descriptor based gpios, the gpio numbers
are not used anymore. The power_clk_name and the platform
specific setup and close hooks are not used by anybody, and
we should not encourage use of such things, so removing them.

Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Heikki Krogerus 2014-04-01 17:02:53 +03:00 committed by Johannes Berg
parent 7bd494491b
commit 848ef58695
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/rfkill-gpio.h
View File

@ -27,21 +27,11 @@
* struct rfkill_gpio_platform_data - platform data for rfkill gpio device. * struct rfkill_gpio_platform_data - platform data for rfkill gpio device.
* for unused gpio's, the expected value is -1. * for unused gpio's, the expected value is -1.
* @name: name for the gpio rf kill instance * @name: name for the gpio rf kill instance
* @reset_gpio: GPIO which is used for reseting rfkill switch
* @shutdown_gpio: GPIO which is used for shutdown of rfkill switch
* @power_clk_name: [optional] name of clk to turn off while blocked
* @gpio_runtime_close: clean up platform specific gpio configuration
* @gpio_runtime_setup: set up platform specific gpio configuration
*/ */
struct rfkill_gpio_platform_data { struct rfkill_gpio_platform_data {
char *name; char *name;
int reset_gpio;
int shutdown_gpio;
const char *power_clk_name;
enum rfkill_type type; enum rfkill_type type;
void (*gpio_runtime_close)(struct platform_device *);
int (*gpio_runtime_setup)(struct platform_device *);
}; };
#endif /* __RFKILL_GPIO_H */ #endif /* __RFKILL_GPIO_H */

15
net/rfkill/rfkill-gpio.c
View File

@ -87,7 +87,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
{ {
struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data; struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
struct rfkill_gpio_data *rfkill; struct rfkill_gpio_data *rfkill;
const char *clk_name = NULL;
struct gpio_desc *gpio; struct gpio_desc *gpio;
int ret; int ret;
int len; int len;
@ -101,7 +100,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
} else if (pdata) { } else if (pdata) {
clk_name = pdata->power_clk_name;
rfkill->name = pdata->name; rfkill->name = pdata->name;
rfkill->type = pdata->type; rfkill->type = pdata->type;
} else { } else {
@ -120,7 +118,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name); snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name);
snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->name); snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->name);
rfkill->clk = devm_clk_get(&pdev->dev, clk_name); rfkill->clk = devm_clk_get(&pdev->dev, NULL);
gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0); gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0);
if (!IS_ERR(gpio)) { if (!IS_ERR(gpio)) {
@ -146,14 +144,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
if (pdata && pdata->gpio_runtime_setup) {
ret = pdata->gpio_runtime_setup(pdev);
if (ret) {
dev_err(&pdev->dev, "can't set up gpio\n");
return ret;
}
}
rfkill->rfkill_dev = rfkill_alloc(rfkill->name, &pdev->dev, rfkill->rfkill_dev = rfkill_alloc(rfkill->name, &pdev->dev,
rfkill->type, &rfkill_gpio_ops, rfkill->type, &rfkill_gpio_ops,
rfkill); rfkill);
@ -174,10 +164,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
static int rfkill_gpio_remove(struct platform_device *pdev) static int rfkill_gpio_remove(struct platform_device *pdev)
{ {
struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev); struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev);
struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
if (pdata && pdata->gpio_runtime_close)
pdata->gpio_runtime_close(pdev);
rfkill_unregister(rfkill->rfkill_dev); rfkill_unregister(rfkill->rfkill_dev);
rfkill_destroy(rfkill->rfkill_dev); rfkill_destroy(rfkill->rfkill_dev);