Drivers: macintosh: 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, __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: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -253,7 +253,7 @@ static void rackmeter_do_timer(struct work_struct *work)
|
||||
msecs_to_jiffies(CPU_SAMPLING_RATE));
|
||||
}
|
||||
|
||||
static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
|
||||
static void rackmeter_init_cpu_sniffer(struct rackmeter *rm)
|
||||
{
|
||||
unsigned int cpu;
|
||||
|
||||
@@ -287,7 +287,7 @@ static void rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
|
||||
cancel_delayed_work_sync(&rm->cpu[1].sniffer);
|
||||
}
|
||||
|
||||
static int __devinit rackmeter_setup(struct rackmeter *rm)
|
||||
static int rackmeter_setup(struct rackmeter *rm)
|
||||
{
|
||||
pr_debug("rackmeter: setting up i2s..\n");
|
||||
rackmeter_setup_i2s(rm);
|
||||
@@ -362,8 +362,8 @@ static irqreturn_t rackmeter_irq(int irq, void *arg)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit rackmeter_probe(struct macio_dev* mdev,
|
||||
const struct of_device_id *match)
|
||||
static int rackmeter_probe(struct macio_dev* mdev,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *i2s = NULL, *np = NULL;
|
||||
struct rackmeter *rm = NULL;
|
||||
@@ -521,7 +521,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit rackmeter_remove(struct macio_dev* mdev)
|
||||
static int rackmeter_remove(struct macio_dev* mdev)
|
||||
{
|
||||
struct rackmeter *rm = dev_get_drvdata(&mdev->ofdev.dev);
|
||||
|
||||
@@ -588,7 +588,7 @@ static struct macio_driver rackmeter_driver = {
|
||||
.of_match_table = rackmeter_match,
|
||||
},
|
||||
.probe = rackmeter_probe,
|
||||
.remove = __devexit_p(rackmeter_remove),
|
||||
.remove = rackmeter_remove,
|
||||
.shutdown = rackmeter_shutdown,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user