Skip to content

L
linux
Commit 1da42fb6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 612b95cd
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
drivers/macintosh/macio_asic.c
View file @ 1da42fb6
...@@ -679,7 +679,7 @@ void macio_release_resources(struct macio_dev *dev) ...@@ -679,7 +679,7 @@ void macio_release_resources(struct macio_dev *dev)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __devinit macio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int macio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
struct device_node* np; struct device_node* np;
struct macio_chip* chip; struct macio_chip* chip;
...@@ -739,7 +739,7 @@ static int __devinit macio_pci_probe(struct pci_dev *pdev, const struct pci_devi ...@@ -739,7 +739,7 @@ static int __devinit macio_pci_probe(struct pci_dev *pdev, const struct pci_devi
return 0; return 0;
} }
static void __devexit macio_pci_remove(struct pci_dev* pdev) static void macio_pci_remove(struct pci_dev* pdev)
{ {
panic("removing of macio-asic not supported !\n"); panic("removing of macio-asic not supported !\n");
} }
...@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev) ...@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
* MacIO is matched against any Apple ID, it's probe() function * MacIO is matched against any Apple ID, it's probe() function
* will then decide wether it applies or not * will then decide wether it applies or not
*/ */
static const struct pci_device_id __devinitconst pci_ids[] = { { static const struct pci_device_id pci_ids[] = { {
.vendor = PCI_VENDOR_ID_APPLE, .vendor = PCI_VENDOR_ID_APPLE,
.device = PCI_ANY_ID, .device = PCI_ANY_ID,
.subvendor = PCI_ANY_ID, .subvendor = PCI_ANY_ID,
......
drivers/macintosh/mediabay.c
View file @ 1da42fb6
...@@ -556,7 +556,8 @@ static int media_bay_task(void *x) ...@@ -556,7 +556,8 @@ static int media_bay_task(void *x)
return 0; return 0;
} }
static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match) static int media_bay_attach(struct macio_dev *mdev,
const struct of_device_id *match)
{ {
struct media_bay_info* bay; struct media_bay_info* bay;
u32 __iomem *regbase; u32 __iomem *regbase;
......
drivers/macintosh/rack-meter.c
View file @ 1da42fb6
...@@ -253,7 +253,7 @@ static void rackmeter_do_timer(struct work_struct *work) ...@@ -253,7 +253,7 @@ static void rackmeter_do_timer(struct work_struct *work)
msecs_to_jiffies(CPU_SAMPLING_RATE)); 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; unsigned int cpu;
...@@ -287,7 +287,7 @@ static void rackmeter_stop_cpu_sniffer(struct rackmeter *rm) ...@@ -287,7 +287,7 @@ static void rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
cancel_delayed_work_sync(&rm->cpu[1].sniffer); 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"); pr_debug("rackmeter: setting up i2s..\n");
rackmeter_setup_i2s(rm); rackmeter_setup_i2s(rm);
...@@ -362,8 +362,8 @@ static irqreturn_t rackmeter_irq(int irq, void *arg) ...@@ -362,8 +362,8 @@ static irqreturn_t rackmeter_irq(int irq, void *arg)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit rackmeter_probe(struct macio_dev* mdev, static int rackmeter_probe(struct macio_dev* mdev,
const struct of_device_id *match) const struct of_device_id *match)
{ {
struct device_node *i2s = NULL, *np = NULL; struct device_node *i2s = NULL, *np = NULL;
struct rackmeter *rm = NULL; struct rackmeter *rm = NULL;
...@@ -521,7 +521,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev, ...@@ -521,7 +521,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
return rc; 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); struct rackmeter *rm = dev_get_drvdata(&mdev->ofdev.dev);
...@@ -588,7 +588,7 @@ static struct macio_driver rackmeter_driver = { ...@@ -588,7 +588,7 @@ static struct macio_driver rackmeter_driver = {
.of_match_table = rackmeter_match, .of_match_table = rackmeter_match,
}, },
.probe = rackmeter_probe, .probe = rackmeter_probe,
.remove = __devexit_p(rackmeter_remove), .remove = rackmeter_remove,
.shutdown = rackmeter_shutdown, .shutdown = rackmeter_shutdown,
}; };
......
drivers/macintosh/windfarm_ad7417_sensor.c
View file @ 1da42fb6
...@@ -177,9 +177,9 @@ static const struct wf_sensor_ops wf_ad7417_adc_ops = { ...@@ -177,9 +177,9 @@ static const struct wf_sensor_ops wf_ad7417_adc_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv, static void wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
int index, const char *name, int index, const char *name,
const struct wf_sensor_ops *ops) const struct wf_sensor_ops *ops)
{ {
pv->sensors[index].name = kasprintf(GFP_KERNEL, "%s-%d", name, pv->cpu); pv->sensors[index].name = kasprintf(GFP_KERNEL, "%s-%d", name, pv->cpu);
pv->sensors[index].priv = pv; pv->sensors[index].priv = pv;
...@@ -188,7 +188,7 @@ static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv, ...@@ -188,7 +188,7 @@ static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
kref_get(&pv->ref); kref_get(&pv->ref);
} }
static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv) static void wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
{ {
int rc; int rc;
u8 buf[2]; u8 buf[2];
...@@ -230,8 +230,8 @@ static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv) ...@@ -230,8 +230,8 @@ static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
pv->config = config; pv->config = config;
} }
static int __devinit wf_ad7417_probe(struct i2c_client *client, static int wf_ad7417_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wf_ad7417_priv *pv; struct wf_ad7417_priv *pv;
const struct mpu_data *mpu; const struct mpu_data *mpu;
...@@ -290,7 +290,7 @@ static int __devinit wf_ad7417_probe(struct i2c_client *client, ...@@ -290,7 +290,7 @@ static int __devinit wf_ad7417_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit wf_ad7417_remove(struct i2c_client *client) static int wf_ad7417_remove(struct i2c_client *client)
{ {
struct wf_ad7417_priv *pv = dev_get_drvdata(&client->dev); struct wf_ad7417_priv *pv = dev_get_drvdata(&client->dev);
int i; int i;
...@@ -322,7 +322,7 @@ static struct i2c_driver wf_ad7417_driver = { ...@@ -322,7 +322,7 @@ static struct i2c_driver wf_ad7417_driver = {
.id_table = wf_ad7417_id, .id_table = wf_ad7417_id,
}; };
static int __devinit wf_ad7417_init(void) static int wf_ad7417_init(void)
{ {
/* This is only supported on these machines */ /* This is only supported on these machines */
if (!of_machine_is_compatible("PowerMac7,2") && if (!of_machine_is_compatible("PowerMac7,2") &&
...@@ -333,7 +333,7 @@ static int __devinit wf_ad7417_init(void) ...@@ -333,7 +333,7 @@ static int __devinit wf_ad7417_init(void)
return i2c_add_driver(&wf_ad7417_driver); return i2c_add_driver(&wf_ad7417_driver);
} }
static void __devexit wf_ad7417_exit(void) static void wf_ad7417_exit(void)
{ {
i2c_del_driver(&wf_ad7417_driver); i2c_del_driver(&wf_ad7417_driver);
} }
......
drivers/macintosh/windfarm_fcu_controls.c
View file @ 1da42fb6
...@@ -282,7 +282,7 @@ static const struct wf_control_ops wf_fcu_fan_pwm_ops = { ...@@ -282,7 +282,7 @@ static const struct wf_control_ops wf_fcu_fan_pwm_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static void __devinit wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan) static void wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan)
{ {
const struct mpu_data *mpu = wf_get_mpu(0); const struct mpu_data *mpu = wf_get_mpu(0);
u16 pump_min = 0, pump_max = 0xffff; u16 pump_min = 0, pump_max = 0xffff;
...@@ -317,7 +317,7 @@ static void __devinit wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan) ...@@ -317,7 +317,7 @@ static void __devinit wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan)
fan->ctrl.name, pump_min, pump_max); fan->ctrl.name, pump_min, pump_max);
} }
static void __devinit wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan) static void wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan)
{ {
struct wf_fcu_priv *pv = fan->fcu_priv; struct wf_fcu_priv *pv = fan->fcu_priv;
const struct mpu_data *mpu0 = wf_get_mpu(0); const struct mpu_data *mpu0 = wf_get_mpu(0);
...@@ -359,9 +359,8 @@ static void __devinit wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan) ...@@ -359,9 +359,8 @@ static void __devinit wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan)
fan->ctrl.name, fan->min, fan->max); fan->ctrl.name, fan->min, fan->max);
} }
static void __devinit wf_fcu_add_fan(struct wf_fcu_priv *pv, static void wf_fcu_add_fan(struct wf_fcu_priv *pv, const char *name,
const char *name, int type, int id)
int type, int id)
{ {
struct wf_fcu_fan *fan; struct wf_fcu_fan *fan;
...@@ -399,7 +398,7 @@ static void __devinit wf_fcu_add_fan(struct wf_fcu_priv *pv, ...@@ -399,7 +398,7 @@ static void __devinit wf_fcu_add_fan(struct wf_fcu_priv *pv,
kref_get(&pv->ref); kref_get(&pv->ref);
} }
static void __devinit wf_fcu_lookup_fans(struct wf_fcu_priv *pv) static void wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
{ {
/* Translation of device-tree location properties to /* Translation of device-tree location properties to
* windfarm fan names * windfarm fan names
...@@ -481,7 +480,7 @@ static void __devinit wf_fcu_lookup_fans(struct wf_fcu_priv *pv) ...@@ -481,7 +480,7 @@ static void __devinit wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
} }
} }
static void __devinit wf_fcu_default_fans(struct wf_fcu_priv *pv) static void wf_fcu_default_fans(struct wf_fcu_priv *pv)
{ {
/* We only support the default fans for PowerMac7,2 */ /* We only support the default fans for PowerMac7,2 */
if (!of_machine_is_compatible("PowerMac7,2")) if (!of_machine_is_compatible("PowerMac7,2"))
...@@ -496,7 +495,7 @@ static void __devinit wf_fcu_default_fans(struct wf_fcu_priv *pv) ...@@ -496,7 +495,7 @@ static void __devinit wf_fcu_default_fans(struct wf_fcu_priv *pv)
wf_fcu_add_fan(pv, "cpu-rear-fan-1", FCU_FAN_RPM, 6); wf_fcu_add_fan(pv, "cpu-rear-fan-1", FCU_FAN_RPM, 6);
} }
static int __devinit wf_fcu_init_chip(struct wf_fcu_priv *pv) static int wf_fcu_init_chip(struct wf_fcu_priv *pv)
{ {
unsigned char buf = 0xff; unsigned char buf = 0xff;
int rc; int rc;
...@@ -518,8 +517,8 @@ static int __devinit wf_fcu_init_chip(struct wf_fcu_priv *pv) ...@@ -518,8 +517,8 @@ static int __devinit wf_fcu_init_chip(struct wf_fcu_priv *pv)
return 0; return 0;
} }
static int __devinit wf_fcu_probe(struct i2c_client *client, static int wf_fcu_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wf_fcu_priv *pv; struct wf_fcu_priv *pv;
...@@ -564,7 +563,7 @@ static int __devinit wf_fcu_probe(struct i2c_client *client, ...@@ -564,7 +563,7 @@ static int __devinit wf_fcu_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit wf_fcu_remove(struct i2c_client *client) static int wf_fcu_remove(struct i2c_client *client)
{ {
struct wf_fcu_priv *pv = dev_get_drvdata(&client->dev); struct wf_fcu_priv *pv = dev_get_drvdata(&client->dev);
struct wf_fcu_fan *fan; struct wf_fcu_fan *fan;
......
drivers/macintosh/windfarm_pm112.c
View file @ 1da42fb6
...@@ -656,7 +656,7 @@ static int wf_pm112_probe(struct platform_device *dev) ...@@ -656,7 +656,7 @@ static int wf_pm112_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit wf_pm112_remove(struct platform_device *dev) static int wf_pm112_remove(struct platform_device *dev)
{ {
wf_unregister_client(&pm112_events); wf_unregister_client(&pm112_events);
/* should release all sensors and controls */ /* should release all sensors and controls */
...@@ -665,7 +665,7 @@ static int __devexit wf_pm112_remove(struct platform_device *dev) ...@@ -665,7 +665,7 @@ static int __devexit wf_pm112_remove(struct platform_device *dev)
static struct platform_driver wf_pm112_driver = { static struct platform_driver wf_pm112_driver = {
.probe = wf_pm112_probe, .probe = wf_pm112_probe,
.remove = __devexit_p(wf_pm112_remove), .remove = wf_pm112_remove,
.driver = { .driver = {
.name = "windfarm", .name = "windfarm",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/macintosh/windfarm_pm121.c
View file @ 1da42fb6
...@@ -987,7 +987,7 @@ static int pm121_probe(struct platform_device *ddev) ...@@ -987,7 +987,7 @@ static int pm121_probe(struct platform_device *ddev)
return 0; return 0;
} }
static int __devexit pm121_remove(struct platform_device *ddev) static int pm121_remove(struct platform_device *ddev)
{ {
wf_unregister_client(&pm121_events); wf_unregister_client(&pm121_events);
return 0; return 0;
...@@ -995,7 +995,7 @@ static int __devexit pm121_remove(struct platform_device *ddev) ...@@ -995,7 +995,7 @@ static int __devexit pm121_remove(struct platform_device *ddev)
static struct platform_driver pm121_driver = { static struct platform_driver pm121_driver = {
.probe = pm121_probe, .probe = pm121_probe,
.remove = __devexit_p(pm121_remove), .remove = pm121_remove,
.driver = { .driver = {
.name = "windfarm", .name = "windfarm",
.bus = &platform_bus_type, .bus = &platform_bus_type,
......
drivers/macintosh/windfarm_pm72.c
View file @ 1da42fb6
...@@ -776,7 +776,7 @@ static int wf_pm72_probe(struct platform_device *dev) ...@@ -776,7 +776,7 @@ static int wf_pm72_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit wf_pm72_remove(struct platform_device *dev) static int wf_pm72_remove(struct platform_device *dev)
{ {
wf_unregister_client(&pm72_events); wf_unregister_client(&pm72_events);
......
drivers/macintosh/windfarm_pm81.c
View file @ 1da42fb6
...@@ -720,7 +720,7 @@ static int wf_smu_probe(struct platform_device *ddev) ...@@ -720,7 +720,7 @@ static int wf_smu_probe(struct platform_device *ddev)
return 0; return 0;
} }
static int __devexit wf_smu_remove(struct platform_device *ddev) static int wf_smu_remove(struct platform_device *ddev)
{ {
wf_unregister_client(&wf_smu_events); wf_unregister_client(&wf_smu_events);
...@@ -763,7 +763,7 @@ static int __devexit wf_smu_remove(struct platform_device *ddev) ...@@ -763,7 +763,7 @@ static int __devexit wf_smu_remove(struct platform_device *ddev)
static struct platform_driver wf_smu_driver = { static struct platform_driver wf_smu_driver = {
.probe = wf_smu_probe, .probe = wf_smu_probe,
.remove = __devexit_p(wf_smu_remove), .remove = wf_smu_remove,
.driver = { .driver = {
.name = "windfarm", .name = "windfarm",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/macintosh/windfarm_pm91.c
View file @ 1da42fb6
...@@ -642,7 +642,7 @@ static int wf_smu_probe(struct platform_device *ddev) ...@@ -642,7 +642,7 @@ static int wf_smu_probe(struct platform_device *ddev)
return 0; return 0;
} }
static int __devexit wf_smu_remove(struct platform_device *ddev) static int wf_smu_remove(struct platform_device *ddev)
{ {
wf_unregister_client(&wf_smu_events); wf_unregister_client(&wf_smu_events);
...@@ -692,7 +692,7 @@ static int __devexit wf_smu_remove(struct platform_device *ddev) ...@@ -692,7 +692,7 @@ static int __devexit wf_smu_remove(struct platform_device *ddev)
static struct platform_driver wf_smu_driver = { static struct platform_driver wf_smu_driver = {
.probe = wf_smu_probe, .probe = wf_smu_probe,
.remove = __devexit_p(wf_smu_remove), .remove = wf_smu_remove,
.driver = { .driver = {
.name = "windfarm", .name = "windfarm",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/macintosh/windfarm_rm31.c
View file @ 1da42fb6
...@@ -669,7 +669,7 @@ static int wf_rm31_probe(struct platform_device *dev) ...@@ -669,7 +669,7 @@ static int wf_rm31_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit wf_rm31_remove(struct platform_device *dev) static int wf_rm31_remove(struct platform_device *dev)
{ {
wf_unregister_client(&rm31_events); wf_unregister_client(&rm31_events);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7