|
@@ -36,8 +36,6 @@ struct rfkill_gpio_data {
|
|
|
struct gpio_desc *shutdown_gpio;
|
|
|
|
|
|
struct rfkill *rfkill_dev;
|
|
|
- char *reset_name;
|
|
|
- char *shutdown_name;
|
|
|
struct clk *clk;
|
|
|
|
|
|
bool clk_enabled;
|
|
@@ -89,7 +87,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
|
|
|
struct rfkill_gpio_data *rfkill;
|
|
|
struct gpio_desc *gpio;
|
|
|
int ret;
|
|
|
- int len;
|
|
|
|
|
|
rfkill = devm_kzalloc(&pdev->dev, sizeof(*rfkill), GFP_KERNEL);
|
|
|
if (!rfkill)
|
|
@@ -106,21 +103,9 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
- len = strlen(rfkill->name);
|
|
|
- rfkill->reset_name = devm_kzalloc(&pdev->dev, len + 7, GFP_KERNEL);
|
|
|
- if (!rfkill->reset_name)
|
|
|
- return -ENOMEM;
|
|
|
-
|
|
|
- rfkill->shutdown_name = devm_kzalloc(&pdev->dev, len + 10, GFP_KERNEL);
|
|
|
- if (!rfkill->shutdown_name)
|
|
|
- return -ENOMEM;
|
|
|
-
|
|
|
- snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name);
|
|
|
- snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->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, "reset", 0);
|
|
|
if (!IS_ERR(gpio)) {
|
|
|
ret = gpiod_direction_output(gpio, 0);
|
|
|
if (ret)
|
|
@@ -128,7 +113,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
|
|
|
rfkill->reset_gpio = gpio;
|
|
|
}
|
|
|
|
|
|
- gpio = devm_gpiod_get_index(&pdev->dev, rfkill->shutdown_name, 1);
|
|
|
+ gpio = devm_gpiod_get_index(&pdev->dev, "shutdown", 1);
|
|
|
if (!IS_ERR(gpio)) {
|
|
|
ret = gpiod_direction_output(gpio, 0);
|
|
|
if (ret)
|