Skip to content

Commit

Permalink
rfkill: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and John W. Linville committed Dec 6, 2012
1 parent bde327e commit 9e2b29d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion net/rfkill/rfkill-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static int rfkill_gpio_remove(struct platform_device *pdev)

static struct platform_driver rfkill_gpio_driver = {
.probe = rfkill_gpio_probe,
.remove = __devexit_p(rfkill_gpio_remove),
.remove = rfkill_gpio_remove,
.driver = {
.name = "rfkill_gpio",
.owner = THIS_MODULE,
Expand Down
6 changes: 3 additions & 3 deletions net/rfkill/rfkill-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct rfkill_ops rfkill_regulator_ops = {
.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_data *rfkill_data;
Expand Down Expand Up @@ -122,7 +122,7 @@ static int __devinit rfkill_regulator_probe(struct platform_device *pdev)
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 *rf_kill = rfkill_data->rf_kill;
Expand All @@ -137,7 +137,7 @@ static int __devexit rfkill_regulator_remove(struct platform_device *pdev)

static struct platform_driver rfkill_regulator_driver = {
.probe = rfkill_regulator_probe,
.remove = __devexit_p(rfkill_regulator_remove),
.remove = rfkill_regulator_remove,
.driver = {
.name = "rfkill-regulator",
.owner = THIS_MODULE,
Expand Down

0 comments on commit 9e2b29d

Please sign in to comment.