diff options
author | Sangwook Lee <sangwook.lee@linaro.org> | 2011-09-29 07:57:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-03 15:19:19 -0400 |
commit | e209c5a7ed1870ab7f112ad47083b5d616e8b6a4 (patch) | |
tree | e7f519c0946eca6f1c8f9a818352303e7fb25f42 /net/rfkill | |
parent | 893d73f4a15bda966cb72f84897898eb235e134c (diff) |
net:rfkill: add a gpio setup function into GPIO rfkill
Add a gpio setup function which gives a chance to set up
platform specific configuration such as pin multiplexing,
input/output direction at the runtime or booting time.
Signed-off-by: Sangwook Lee <sangwook.lee@linaro.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/rfkill')
-rw-r--r-- | net/rfkill/rfkill-gpio.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 256c5ddd2d72..128677d69056 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c | |||
@@ -101,6 +101,14 @@ static int rfkill_gpio_probe(struct platform_device *pdev) | |||
101 | if (!rfkill) | 101 | if (!rfkill) |
102 | return -ENOMEM; | 102 | return -ENOMEM; |
103 | 103 | ||
104 | if (pdata->gpio_runtime_setup) { | ||
105 | ret = pdata->gpio_runtime_setup(pdev); | ||
106 | if (ret) { | ||
107 | pr_warn("%s: can't set up gpio\n", __func__); | ||
108 | return ret; | ||
109 | } | ||
110 | } | ||
111 | |||
104 | rfkill->pdata = pdata; | 112 | rfkill->pdata = pdata; |
105 | 113 | ||
106 | len = strlen(pdata->name); | 114 | len = strlen(pdata->name); |
@@ -182,7 +190,10 @@ fail_alloc: | |||
182 | static int rfkill_gpio_remove(struct platform_device *pdev) | 190 | static int rfkill_gpio_remove(struct platform_device *pdev) |
183 | { | 191 | { |
184 | struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev); | 192 | struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev); |
193 | struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data; | ||
185 | 194 | ||
195 | if (pdata->gpio_runtime_close) | ||
196 | pdata->gpio_runtime_close(pdev); | ||
186 | rfkill_unregister(rfkill->rfkill_dev); | 197 | rfkill_unregister(rfkill->rfkill_dev); |
187 | rfkill_destroy(rfkill->rfkill_dev); | 198 | rfkill_destroy(rfkill->rfkill_dev); |
188 | if (gpio_is_valid(rfkill->pdata->shutdown_gpio)) | 199 | if (gpio_is_valid(rfkill->pdata->shutdown_gpio)) |