Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drivers: sbus: remove __dev* attributes.

Browse Source 
CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:24:23 -08:00
parent 9b3c6e85c2
commit 082a2004db
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/sbus/char/bbc_i2c.c
View File

@ -355,7 +355,7 @@ fail:
extern int bbc_envctrl_init(struct bbc_i2c_bus *bp); extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp); extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
static int __devinit bbc_i2c_probe(struct platform_device *op) static int bbc_i2c_probe(struct platform_device *op)
{ {
struct bbc_i2c_bus *bp; struct bbc_i2c_bus *bp;
int err, index = 0; int err, index = 0;
@ -379,7 +379,7 @@ static int __devinit bbc_i2c_probe(struct platform_device *op)
return err; return err;
} }
static int __devexit bbc_i2c_remove(struct platform_device *op) static int bbc_i2c_remove(struct platform_device *op)
{ {
struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev); struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);
@ -413,7 +413,7 @@ static struct platform_driver bbc_i2c_driver = {
.of_match_table = bbc_i2c_match, .of_match_table = bbc_i2c_match,
}, },
.probe = bbc_i2c_probe, .probe = bbc_i2c_probe,
.remove = __devexit_p(bbc_i2c_remove), .remove = bbc_i2c_remove,
}; };
module_platform_driver(bbc_i2c_driver); module_platform_driver(bbc_i2c_driver);

6
drivers/sbus/char/display7seg.c
View File

@ -171,7 +171,7 @@ static struct miscdevice d7s_miscdev = {
.fops = &d7s_fops .fops = &d7s_fops
}; };
static int __devinit d7s_probe(struct platform_device *op) static int d7s_probe(struct platform_device *op)
{ {
struct device_node *opts; struct device_node *opts;
int err = -EINVAL; int err = -EINVAL;
@ -236,7 +236,7 @@ out_free:
goto out; goto out;
} }
static int __devexit d7s_remove(struct platform_device *op) static int d7s_remove(struct platform_device *op)
{ {
struct d7s *p = dev_get_drvdata(&op->dev); struct d7s *p = dev_get_drvdata(&op->dev);
u8 regs = readb(p->regs); u8 regs = readb(p->regs);
@ -272,7 +272,7 @@ static struct platform_driver d7s_driver = {
.of_match_table = d7s_match, .of_match_table = d7s_match,
}, },
.probe = d7s_probe, .probe = d7s_probe,
.remove = __devexit_p(d7s_remove), .remove = d7s_remove,
}; };
module_platform_driver(d7s_driver); module_platform_driver(d7s_driver);

6
drivers/sbus/char/envctrl.c
View File

@ -1028,7 +1028,7 @@ static int kenvctrld(void *__unused)
return 0; return 0;
} }
static int __devinit envctrl_probe(struct platform_device *op) static int envctrl_probe(struct platform_device *op)
{ {
struct device_node *dp; struct device_node *dp;
int index, err; int index, err;
@ -1104,7 +1104,7 @@ out_iounmap:
return err; return err;
} }
static int __devexit envctrl_remove(struct platform_device *op) static int envctrl_remove(struct platform_device *op)
{ {
int index; int index;
@ -1135,7 +1135,7 @@ static struct platform_driver envctrl_driver = {
.of_match_table = envctrl_match, .of_match_table = envctrl_match,
}, },
.probe = envctrl_probe, .probe = envctrl_probe,
.remove = __devexit_p(envctrl_remove), .remove = envctrl_remove,
}; };
module_platform_driver(envctrl_driver); module_platform_driver(envctrl_driver);

6
drivers/sbus/char/flash.c
View File

@ -159,7 +159,7 @@ static const struct file_operations flash_fops = {
static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
static int __devinit flash_probe(struct platform_device *op) static int flash_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct device_node *parent; struct device_node *parent;
@ -190,7 +190,7 @@ static int __devinit flash_probe(struct platform_device *op)
return misc_register(&flash_dev); return misc_register(&flash_dev);
} }
static int __devexit flash_remove(struct platform_device *op) static int flash_remove(struct platform_device *op)
{ {
misc_deregister(&flash_dev); misc_deregister(&flash_dev);
@ -212,7 +212,7 @@ static struct platform_driver flash_driver = {
.of_match_table = flash_match, .of_match_table = flash_match,
}, },
.probe = flash_probe, .probe = flash_probe,
.remove = __devexit_p(flash_remove), .remove = flash_remove,
}; };
module_platform_driver(flash_driver); module_platform_driver(flash_driver);

6
drivers/sbus/char/uctrl.c
View File

@ -347,7 +347,7 @@ static void uctrl_get_external_status(struct uctrl_driver *driver)
} }
static int __devinit uctrl_probe(struct platform_device *op) static int uctrl_probe(struct platform_device *op)
{ {
struct uctrl_driver *p; struct uctrl_driver *p;
int err = -ENOMEM; int err = -ENOMEM;
@ -402,7 +402,7 @@ out_free:
goto out; goto out;
} }
static int __devexit uctrl_remove(struct platform_device *op) static int uctrl_remove(struct platform_device *op)
{ {
struct uctrl_driver *p = dev_get_drvdata(&op->dev); struct uctrl_driver *p = dev_get_drvdata(&op->dev);
@ -430,7 +430,7 @@ static struct platform_driver uctrl_driver = {
.of_match_table = uctrl_match, .of_match_table = uctrl_match,
}, },
.probe = uctrl_probe, .probe = uctrl_probe,
.remove = __devexit_p(uctrl_remove), .remove = uctrl_remove,
}; };