rfkill: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
bde327eff8
commit
9e2b29d0d6
|
@ -213,7 +213,7 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
|
||||||
|
|
||||||
static struct platform_driver rfkill_gpio_driver = {
|
static struct platform_driver rfkill_gpio_driver = {
|
||||||
.probe = rfkill_gpio_probe,
|
.probe = rfkill_gpio_probe,
|
||||||
.remove = __devexit_p(rfkill_gpio_remove),
|
.remove = rfkill_gpio_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "rfkill_gpio",
|
.name = "rfkill_gpio",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -55,7 +55,7 @@ struct rfkill_ops rfkill_regulator_ops = {
|
||||||
.set_block = rfkill_regulator_set_block,
|
.set_block = rfkill_regulator_set_block,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __devinit rfkill_regulator_probe(struct platform_device *pdev)
|
static int rfkill_regulator_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct rfkill_regulator_platform_data *pdata = pdev->dev.platform_data;
|
struct rfkill_regulator_platform_data *pdata = pdev->dev.platform_data;
|
||||||
struct rfkill_regulator_data *rfkill_data;
|
struct rfkill_regulator_data *rfkill_data;
|
||||||
|
@ -122,7 +122,7 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit rfkill_regulator_remove(struct platform_device *pdev)
|
static int rfkill_regulator_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct rfkill_regulator_data *rfkill_data = platform_get_drvdata(pdev);
|
struct rfkill_regulator_data *rfkill_data = platform_get_drvdata(pdev);
|
||||||
struct rfkill *rf_kill = rfkill_data->rf_kill;
|
struct rfkill *rf_kill = rfkill_data->rf_kill;
|
||||||
|
@ -137,7 +137,7 @@ static int __devexit rfkill_regulator_remove(struct platform_device *pdev)
|
||||||
|
|
||||||
static struct platform_driver rfkill_regulator_driver = {
|
static struct platform_driver rfkill_regulator_driver = {
|
||||||
.probe = rfkill_regulator_probe,
|
.probe = rfkill_regulator_probe,
|
||||||
.remove = __devexit_p(rfkill_regulator_remove),
|
.remove = rfkill_regulator_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "rfkill-regulator",
|
.name = "rfkill-regulator",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
Loading…
Reference in a new issue