Drivers: sbus: remove __dev* attributes.
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:
parent
9b3c6e85c2
commit
082a2004db
5 changed files with 15 additions and 15 deletions
|
@ -355,7 +355,7 @@ static struct bbc_i2c_bus * __init attach_one_i2c(struct platform_device *op, in
|
|||
extern int bbc_envctrl_init(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;
|
||||
int err, index = 0;
|
||||
|
@ -379,7 +379,7 @@ static int __devinit bbc_i2c_probe(struct platform_device *op)
|
|||
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);
|
||||
|
||||
|
@ -413,7 +413,7 @@ static struct platform_driver bbc_i2c_driver = {
|
|||
.of_match_table = bbc_i2c_match,
|
||||
},
|
||||
.probe = bbc_i2c_probe,
|
||||
.remove = __devexit_p(bbc_i2c_remove),
|
||||
.remove = bbc_i2c_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bbc_i2c_driver);
|
||||
|
|
|
@ -171,7 +171,7 @@ static struct miscdevice d7s_miscdev = {
|
|||
.fops = &d7s_fops
|
||||
};
|
||||
|
||||
static int __devinit d7s_probe(struct platform_device *op)
|
||||
static int d7s_probe(struct platform_device *op)
|
||||
{
|
||||
struct device_node *opts;
|
||||
int err = -EINVAL;
|
||||
|
@ -236,7 +236,7 @@ static int __devinit d7s_probe(struct platform_device *op)
|
|||
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);
|
||||
u8 regs = readb(p->regs);
|
||||
|
@ -272,7 +272,7 @@ static struct platform_driver d7s_driver = {
|
|||
.of_match_table = d7s_match,
|
||||
},
|
||||
.probe = d7s_probe,
|
||||
.remove = __devexit_p(d7s_remove),
|
||||
.remove = d7s_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(d7s_driver);
|
||||
|
|
|
@ -1028,7 +1028,7 @@ static int kenvctrld(void *__unused)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit envctrl_probe(struct platform_device *op)
|
||||
static int envctrl_probe(struct platform_device *op)
|
||||
{
|
||||
struct device_node *dp;
|
||||
int index, err;
|
||||
|
@ -1104,7 +1104,7 @@ static int __devinit envctrl_probe(struct platform_device *op)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit envctrl_remove(struct platform_device *op)
|
||||
static int envctrl_remove(struct platform_device *op)
|
||||
{
|
||||
int index;
|
||||
|
||||
|
@ -1135,7 +1135,7 @@ static struct platform_driver envctrl_driver = {
|
|||
.of_match_table = envctrl_match,
|
||||
},
|
||||
.probe = envctrl_probe,
|
||||
.remove = __devexit_p(envctrl_remove),
|
||||
.remove = envctrl_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(envctrl_driver);
|
||||
|
|
|
@ -159,7 +159,7 @@ static const struct file_operations 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 *parent;
|
||||
|
@ -190,7 +190,7 @@ static int __devinit flash_probe(struct platform_device *op)
|
|||
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);
|
||||
|
||||
|
@ -212,7 +212,7 @@ static struct platform_driver flash_driver = {
|
|||
.of_match_table = flash_match,
|
||||
},
|
||||
.probe = flash_probe,
|
||||
.remove = __devexit_p(flash_remove),
|
||||
.remove = flash_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(flash_driver);
|
||||
|
|
|
@ -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;
|
||||
int err = -ENOMEM;
|
||||
|
@ -402,7 +402,7 @@ static int __devinit uctrl_probe(struct platform_device *op)
|
|||
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);
|
||||
|
||||
|
@ -430,7 +430,7 @@ static struct platform_driver uctrl_driver = {
|
|||
.of_match_table = uctrl_match,
|
||||
},
|
||||
.probe = uctrl_probe,
|
||||
.remove = __devexit_p(uctrl_remove),
|
||||
.remove = uctrl_remove,
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue