Drivers: ide: 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, __devinitdata, __devinitconst, 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -406,8 +406,8 @@ static const struct ide_port_info icside_v5_port_info = {
|
||||
.chipset = ide_acorn,
|
||||
};
|
||||
|
||||
static int __devinit
|
||||
icside_register_v5(struct icside_state *state, struct expansion_card *ec)
|
||||
static int icside_register_v5(struct icside_state *state,
|
||||
struct expansion_card *ec)
|
||||
{
|
||||
void __iomem *base;
|
||||
struct ide_host *host;
|
||||
@@ -460,8 +460,8 @@ static const struct ide_port_info icside_v6_port_info __initconst = {
|
||||
.chipset = ide_acorn,
|
||||
};
|
||||
|
||||
static int __devinit
|
||||
icside_register_v6(struct icside_state *state, struct expansion_card *ec)
|
||||
static int icside_register_v6(struct icside_state *state,
|
||||
struct expansion_card *ec)
|
||||
{
|
||||
void __iomem *ioc_base, *easi_base;
|
||||
struct ide_host *host;
|
||||
@@ -537,8 +537,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
icside_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
static int icside_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
{
|
||||
struct icside_state *state;
|
||||
void __iomem *idmem;
|
||||
@@ -604,7 +603,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __devexit icside_remove(struct expansion_card *ec)
|
||||
static void icside_remove(struct expansion_card *ec)
|
||||
{
|
||||
struct icside_state *state = ecard_get_drvdata(ec);
|
||||
|
||||
@@ -666,7 +665,7 @@ static const struct ecard_id icside_ids[] = {
|
||||
|
||||
static struct ecard_driver icside_driver = {
|
||||
.probe = icside_probe,
|
||||
.remove = __devexit_p(icside_remove),
|
||||
.remove = icside_remove,
|
||||
.shutdown = icside_shutdown,
|
||||
.id_table = icside_ids,
|
||||
.drv = {
|
||||
|
Reference in New Issue
Block a user