Commit 351a102d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ARM: drivers: 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,
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: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d68dfe3
...@@ -686,8 +686,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, ...@@ -686,8 +686,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
* %-EINVAL no platform data passed * %-EINVAL no platform data passed
* %0 successful. * %0 successful.
*/ */
static int __devinit static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
__sa1111_probe(struct device *me, struct resource *mem, int irq)
{ {
struct sa1111_platform_data *pd = me->platform_data; struct sa1111_platform_data *pd = me->platform_data;
struct sa1111 *sachip; struct sa1111 *sachip;
...@@ -1011,7 +1010,7 @@ static int sa1111_resume(struct platform_device *dev) ...@@ -1011,7 +1010,7 @@ static int sa1111_resume(struct platform_device *dev)
#define sa1111_resume NULL #define sa1111_resume NULL
#endif #endif
static int __devinit sa1111_probe(struct platform_device *pdev) static int sa1111_probe(struct platform_device *pdev)
{ {
struct resource *mem; struct resource *mem;
int irq; int irq;
......
...@@ -176,7 +176,7 @@ static int scoop_resume(struct platform_device *dev) ...@@ -176,7 +176,7 @@ static int scoop_resume(struct platform_device *dev)
#define scoop_resume NULL #define scoop_resume NULL
#endif #endif
static int __devinit scoop_probe(struct platform_device *pdev) static int scoop_probe(struct platform_device *pdev)
{ {
struct scoop_dev *devptr; struct scoop_dev *devptr;
struct scoop_config *inf; struct scoop_config *inf;
...@@ -243,7 +243,7 @@ static int __devinit scoop_probe(struct platform_device *pdev) ...@@ -243,7 +243,7 @@ static int __devinit scoop_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit scoop_remove(struct platform_device *pdev) static int scoop_remove(struct platform_device *pdev)
{ {
struct scoop_dev *sdev = platform_get_drvdata(pdev); struct scoop_dev *sdev = platform_get_drvdata(pdev);
int ret; int ret;
...@@ -268,7 +268,7 @@ static int __devexit scoop_remove(struct platform_device *pdev) ...@@ -268,7 +268,7 @@ static int __devexit scoop_remove(struct platform_device *pdev)
static struct platform_driver scoop_driver = { static struct platform_driver scoop_driver = {
.probe = scoop_probe, .probe = scoop_probe,
.remove = __devexit_p(scoop_remove), .remove = scoop_remove,
.suspend = scoop_suspend, .suspend = scoop_suspend,
.resume = scoop_resume, .resume = scoop_resume,
.driver = { .driver = {
......
...@@ -78,7 +78,7 @@ void pcibios_report_status(u_int status_mask, int warn) ...@@ -78,7 +78,7 @@ void pcibios_report_status(u_int status_mask, int warn)
* Bug 3 is responsible for the sound DMA grinding to a halt. We now * Bug 3 is responsible for the sound DMA grinding to a halt. We now
* live with bug 2. * live with bug 2.
*/ */
static void __devinit pci_fixup_83c553(struct pci_dev *dev) static void pci_fixup_83c553(struct pci_dev *dev)
{ {
/* /*
* Set memory region to start at address 0, and enable IO * Set memory region to start at address 0, and enable IO
...@@ -130,7 +130,7 @@ static void __devinit pci_fixup_83c553(struct pci_dev *dev) ...@@ -130,7 +130,7 @@ static void __devinit pci_fixup_83c553(struct pci_dev *dev)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553, pci_fixup_83c553); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553, pci_fixup_83c553);
static void __devinit pci_fixup_unassign(struct pci_dev *dev) static void pci_fixup_unassign(struct pci_dev *dev)
{ {
dev->resource[0].end -= dev->resource[0].start; dev->resource[0].end -= dev->resource[0].start;
dev->resource[0].start = 0; dev->resource[0].start = 0;
...@@ -142,7 +142,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F, ...@@ -142,7 +142,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F,
* if it is the host bridge by marking it as such. These resources are of * if it is the host bridge by marking it as such. These resources are of
* no consequence to the PCI layer (they are handled elsewhere). * no consequence to the PCI layer (they are handled elsewhere).
*/ */
static void __devinit pci_fixup_dec21285(struct pci_dev *dev) static void pci_fixup_dec21285(struct pci_dev *dev)
{ {
int i; int i;
...@@ -161,7 +161,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_d ...@@ -161,7 +161,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_d
/* /*
* PCI IDE controllers use non-standard I/O port decoding, respect it. * PCI IDE controllers use non-standard I/O port decoding, respect it.
*/ */
static void __devinit pci_fixup_ide_bases(struct pci_dev *dev) static void pci_fixup_ide_bases(struct pci_dev *dev)
{ {
struct resource *r; struct resource *r;
int i; int i;
...@@ -182,7 +182,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); ...@@ -182,7 +182,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
/* /*
* Put the DEC21142 to sleep * Put the DEC21142 to sleep
*/ */
static void __devinit pci_fixup_dec21142(struct pci_dev *dev) static void pci_fixup_dec21142(struct pci_dev *dev)
{ {
pci_write_config_dword(dev, 0x40, 0x80000000); pci_write_config_dword(dev, 0x40, 0x80000000);
} }
...@@ -204,7 +204,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142, pci_fixup_d ...@@ -204,7 +204,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142, pci_fixup_d
* functional. However, The CY82C693U _does not work_ in bus * functional. However, The CY82C693U _does not work_ in bus
* master mode without locking the PCI bus solid. * master mode without locking the PCI bus solid.
*/ */
static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) static void pci_fixup_cy82c693(struct pci_dev *dev)
{ {
if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) { if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
u32 base0, base1; u32 base0, base1;
...@@ -254,7 +254,7 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) ...@@ -254,7 +254,7 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693);
static void __devinit pci_fixup_it8152(struct pci_dev *dev) static void pci_fixup_it8152(struct pci_dev *dev)
{ {
int i; int i;
/* fixup for ITE 8152 devices */ /* fixup for ITE 8152 devices */
...@@ -361,9 +361,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) ...@@ -361,9 +361,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n", printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",
bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis"); bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
} }
#ifdef CONFIG_HOTPLUG
EXPORT_SYMBOL(pcibios_fixup_bus); EXPORT_SYMBOL(pcibios_fixup_bus);
#endif
/* /*
* Swizzle the device pin each time we cross a bridge. If a platform does * Swizzle the device pin each time we cross a bridge. If a platform does
...@@ -380,7 +378,7 @@ EXPORT_SYMBOL(pcibios_fixup_bus); ...@@ -380,7 +378,7 @@ EXPORT_SYMBOL(pcibios_fixup_bus);
* PCI standard swizzle is implemented on plug-in cards and Cardbus based * PCI standard swizzle is implemented on plug-in cards and Cardbus based
* PCI extenders, so it can not be ignored. * PCI extenders, so it can not be ignored.
*/ */
static u8 __devinit pcibios_swizzle(struct pci_dev *dev, u8 *pin) static u8 pcibios_swizzle(struct pci_dev *dev, u8 *pin)
{ {
struct pci_sys_data *sys = dev->sysdata; struct pci_sys_data *sys = dev->sysdata;
int slot, oldpin = *pin; int slot, oldpin = *pin;
......
...@@ -339,7 +339,7 @@ static struct miscdevice etb_miscdev = { ...@@ -339,7 +339,7 @@ static struct miscdevice etb_miscdev = {
.fops = &etb_fops, .fops = &etb_fops,
}; };
static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id) static int etb_probe(struct amba_device *dev, const struct amba_id *id)
{ {
struct tracectx *t = &tracer; struct tracectx *t = &tracer;
int ret = 0; int ret = 0;
...@@ -531,7 +531,7 @@ static ssize_t trace_mode_store(struct kobject *kobj, ...@@ -531,7 +531,7 @@ static ssize_t trace_mode_store(struct kobject *kobj,
static struct kobj_attribute trace_mode_attr = static struct kobj_attribute trace_mode_attr =
__ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store); __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store);
static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id) static int etm_probe(struct amba_device *dev, const struct amba_id *id)
{ {
struct tracectx *t = &tracer; struct tracectx *t = &tracer;
int ret = 0; int ret = 0;
......
...@@ -132,7 +132,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) ...@@ -132,7 +132,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler)
return 0; return 0;
} }
static void __devinit cpu_pmu_init(struct arm_pmu *cpu_pmu) static void cpu_pmu_init(struct arm_pmu *cpu_pmu)
{ {
int cpu; int cpu;
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
...@@ -178,7 +178,7 @@ static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = { ...@@ -178,7 +178,7 @@ static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = {
/* /*
* PMU platform driver and devicetree bindings. * PMU platform driver and devicetree bindings.
*/ */
static struct of_device_id __devinitdata cpu_pmu_of_device_ids[] = { static struct of_device_id cpu_pmu_of_device_ids[] = {
{.compatible = "arm,cortex-a15-pmu", .data = armv7_a15_pmu_init}, {.compatible = "arm,cortex-a15-pmu", .data = armv7_a15_pmu_init},
{.compatible = "arm,cortex-a9-pmu", .data = armv7_a9_pmu_init}, {.compatible = "arm,cortex-a9-pmu", .data = armv7_a9_pmu_init},
{.compatible = "arm,cortex-a8-pmu", .data = armv7_a8_pmu_init}, {.compatible = "arm,cortex-a8-pmu", .data = armv7_a8_pmu_init},
...@@ -190,7 +190,7 @@ static struct of_device_id __devinitdata cpu_pmu_of_device_ids[] = { ...@@ -190,7 +190,7 @@ static struct of_device_id __devinitdata cpu_pmu_of_device_ids[] = {
{}, {},
}; };
static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = { static struct platform_device_id cpu_pmu_plat_device_ids[] = {
{.name = "arm-pmu"}, {.name = "arm-pmu"},
{}, {},
}; };
...@@ -198,7 +198,7 @@ static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = { ...@@ -198,7 +198,7 @@ static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = {
/* /*
* CPU PMU identification and probing. * CPU PMU identification and probing.
*/ */
static int __devinit probe_current_pmu(struct arm_pmu *pmu) static int probe_current_pmu(struct arm_pmu *pmu)
{ {
int cpu = get_cpu(); int cpu = get_cpu();
unsigned long cpuid = read_cpuid_id(); unsigned long cpuid = read_cpuid_id();
...@@ -252,7 +252,7 @@ static int __devinit probe_current_pmu(struct arm_pmu *pmu) ...@@ -252,7 +252,7 @@ static int __devinit probe_current_pmu(struct arm_pmu *pmu)
return ret; return ret;
} }
static int __devinit cpu_pmu_device_probe(struct platform_device *pdev) static int cpu_pmu_device_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id; const struct of_device_id *of_id;
int (*init_fn)(struct arm_pmu *); int (*init_fn)(struct arm_pmu *);
......
...@@ -653,7 +653,7 @@ static int armv6_map_event(struct perf_event *event) ...@@ -653,7 +653,7 @@ static int armv6_map_event(struct perf_event *event)
&armv6_perf_cache_map, 0xFF); &armv6_perf_cache_map, 0xFF);
} }
static int __devinit armv6pmu_init(struct arm_pmu *cpu_pmu) static int armv6pmu_init(struct arm_pmu *cpu_pmu)
{ {
cpu_pmu->name = "v6"; cpu_pmu->name = "v6";
cpu_pmu->handle_irq = armv6pmu_handle_irq; cpu_pmu->handle_irq = armv6pmu_handle_irq;
...@@ -685,7 +685,7 @@ static int armv6mpcore_map_event(struct perf_event *event) ...@@ -685,7 +685,7 @@ static int armv6mpcore_map_event(struct perf_event *event)
&armv6mpcore_perf_cache_map, 0xFF); &armv6mpcore_perf_cache_map, 0xFF);
} }
static int __devinit armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu) static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu)
{ {
cpu_pmu->name = "v6mpcore"; cpu_pmu->name = "v6mpcore";
cpu_pmu->handle_irq = armv6pmu_handle_irq; cpu_pmu->handle_irq = armv6pmu_handle_irq;
......
...@@ -1226,7 +1226,7 @@ static void armv7pmu_init(struct arm_pmu *cpu_pmu) ...@@ -1226,7 +1226,7 @@ static void armv7pmu_init(struct arm_pmu *cpu_pmu)
cpu_pmu->max_period = (1LLU << 32) - 1; cpu_pmu->max_period = (1LLU << 32) - 1;
}; };
static u32 __devinit armv7_read_num_pmnc_events(void) static u32 armv7_read_num_pmnc_events(void)
{ {
u32 nb_cnt; u32 nb_cnt;
...@@ -1237,7 +1237,7 @@ static u32 __devinit armv7_read_num_pmnc_events(void) ...@@ -1237,7 +1237,7 @@ static u32 __devinit armv7_read_num_pmnc_events(void)
return nb_cnt + 1; return nb_cnt + 1;
} }
static int __devinit armv7_a8_pmu_init(struct arm_pmu *cpu_pmu) static int armv7_a8_pmu_init(struct arm_pmu *cpu_pmu)
{ {
armv7pmu_init(cpu_pmu); armv7pmu_init(cpu_pmu);
cpu_pmu->name = "ARMv7 Cortex-A8"; cpu_pmu->name = "ARMv7 Cortex-A8";
...@@ -1246,7 +1246,7 @@ static int __devinit armv7_a8_pmu_init(struct arm_pmu *cpu_pmu) ...@@ -1246,7 +1246,7 @@ static int __devinit armv7_a8_pmu_init(struct arm_pmu *cpu_pmu)
return 0; return 0;
} }
static int __devinit armv7_a9_pmu_init(struct arm_pmu *cpu_pmu) static int armv7_a9_pmu_init(struct arm_pmu *cpu_pmu)
{ {
armv7pmu_init(cpu_pmu); armv7pmu_init(cpu_pmu);
cpu_pmu->name = "ARMv7 Cortex-A9"; cpu_pmu->name = "ARMv7 Cortex-A9";
...@@ -1255,7 +1255,7 @@ static int __devinit armv7_a9_pmu_init(struct arm_pmu *cpu_pmu) ...@@ -1255,7 +1255,7 @@ static int __devinit armv7_a9_pmu_init(struct arm_pmu *cpu_pmu)
return 0; return 0;
} }
static int __devinit armv7_a5_pmu_init(struct arm_pmu *cpu_pmu) static int armv7_a5_pmu_init(struct arm_pmu *cpu_pmu)
{ {
armv7pmu_init(cpu_pmu); armv7pmu_init(cpu_pmu);
cpu_pmu->name = "ARMv7 Cortex-A5"; cpu_pmu->name = "ARMv7 Cortex-A5";
...@@ -1264,7 +1264,7 @@ static int __devinit armv7_a5_pmu_init(struct arm_pmu *cpu_pmu) ...@@ -1264,7 +1264,7 @@ static int __devinit armv7_a5_pmu_init(struct arm_pmu *cpu_pmu)
return 0; return 0;
} }
static int __devinit armv7_a15_pmu_init(struct arm_pmu *cpu_pmu) static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu)
{ {
armv7pmu_init(cpu_pmu); armv7pmu_init(cpu_pmu);
cpu_pmu->name = "ARMv7 Cortex-A15"; cpu_pmu->name = "ARMv7 Cortex-A15";
...@@ -1274,7 +1274,7 @@ static int __devinit armv7_a15_pmu_init(struct arm_pmu *cpu_pmu) ...@@ -1274,7 +1274,7 @@ static int __devinit armv7_a15_pmu_init(struct arm_pmu *cpu_pmu)
return 0; return 0;
} }
static int __devinit armv7_a7_pmu_init(struct arm_pmu *cpu_pmu) static int armv7_a7_pmu_init(struct arm_pmu *cpu_pmu)
{ {
armv7pmu_init(cpu_pmu); armv7pmu_init(cpu_pmu);
cpu_pmu->name = "ARMv7 Cortex-A7"; cpu_pmu->name = "ARMv7 Cortex-A7";
......
...@@ -440,7 +440,7 @@ static int xscale_map_event(struct perf_event *event) ...@@ -440,7 +440,7 @@ static int xscale_map_event(struct perf_event *event)
&xscale_perf_cache_map, 0xFF); &xscale_perf_cache_map, 0xFF);
} }
static int __devinit xscale1pmu_init(struct arm_pmu *cpu_pmu) static int xscale1pmu_init(struct arm_pmu *cpu_pmu)
{ {
cpu_pmu->name = "xscale1"; cpu_pmu->name = "xscale1";
cpu_pmu->handle_irq = xscale1pmu_handle_irq; cpu_pmu->handle_irq = xscale1pmu_handle_irq;
...@@ -810,7 +810,7 @@ static inline void xscale2pmu_write_counter(struct perf_event *event, u32 val) ...@@ -810,7 +810,7 @@ static inline void xscale2pmu_write_counter(struct perf_event *event, u32 val)
} }
} }
static int __devinit xscale2pmu_init(struct arm_pmu *cpu_pmu) static int xscale2pmu_init(struct arm_pmu *cpu_pmu)
{ {
cpu_pmu->name = "xscale2"; cpu_pmu->name = "xscale2";
cpu_pmu->handle_irq = xscale2pmu_handle_irq; cpu_pmu->handle_irq = xscale2pmu_handle_irq;
......
...@@ -358,7 +358,7 @@ static int cpld_video_probe(struct i2c_client *client, ...@@ -358,7 +358,7 @@ static int cpld_video_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit cpld_video_remove(struct i2c_client *client) static int cpld_video_remove(struct i2c_client *client)
{ {
cpld_client = NULL; cpld_client = NULL;
return 0; return 0;
......
...@@ -256,7 +256,7 @@ static int cdce_probe(struct i2c_client *client, ...@@ -256,7 +256,7 @@ static int cdce_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit cdce_remove(struct i2c_client *client) static int cdce_remove(struct i2c_client *client)
{ {
cdce_i2c_client = NULL; cdce_i2c_client = NULL;
return 0; return 0;
...@@ -274,7 +274,7 @@ static struct i2c_driver cdce_driver = { ...@@ -274,7 +274,7 @@ static struct i2c_driver cdce_driver = {
.name = "cdce949", .name = "cdce949",
}, },
.probe = cdce_probe, .probe = cdce_probe,
.remove = __devexit_p(cdce_remove), .remove = cdce_remove,
.id_table = cdce_id, .id_table = cdce_id,
}; };
......
...@@ -135,7 +135,7 @@ static struct pci_ops pcie_ops = { ...@@ -135,7 +135,7 @@ static struct pci_ops pcie_ops = {
.write = pcie_wr_conf, .write = pcie_wr_conf,
}; };
static void __devinit rc_pci_fixup(struct pci_dev *dev) static void rc_pci_fixup(struct pci_dev *dev)
{ {
/* /*
* Prevent enumeration of root complex. * Prevent enumeration of root complex.
......
...@@ -188,7 +188,7 @@ static struct cpufreq_driver mxc_driver = { ...@@ -188,7 +188,7 @@ static struct cpufreq_driver mxc_driver = {
.name = "imx", .name = "imx",
}; };
static int __devinit mxc_cpufreq_driver_init(void) static int mxc_cpufreq_driver_init(void)
{ {
return cpufreq_register_driver(&mxc_driver); return cpufreq_register_driver(&mxc_driver);
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define BP_MMDC_MAPSR_PSD 0 #define BP_MMDC_MAPSR_PSD 0
#define BP_MMDC_MAPSR_PSS 4 #define BP_MMDC_MAPSR_PSS 4
static int __devinit imx_mmdc_probe(struct platform_device *pdev) static int imx_mmdc_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
void __iomem *mmdc_base, *reg; void __iomem *mmdc_base, *reg;
......
...@@ -504,7 +504,7 @@ iop13xx_pci_abort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) ...@@ -504,7 +504,7 @@ iop13xx_pci_abort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
/* Scan an IOP13XX PCI bus. nr selects which ATU we use. /* Scan an IOP13XX PCI bus. nr selects which ATU we use.
*/ */
struct pci_bus * __devinit iop13xx_scan_bus(int nr, struct pci_sys_data *sys) struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *sys)
{ {
int which_atu; int which_atu;
struct pci_bus *bus = NULL; struct pci_bus *bus = NULL;
......
...@@ -214,7 +214,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) ...@@ -214,7 +214,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
* PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on
* the device. Decoding setup is handled by the orion code. * the device. Decoding setup is handled by the orion code.
*/ */
static void __devinit rc_pci_fixup(struct pci_dev *dev) static void rc_pci_fixup(struct pci_dev *dev)
{ {
if (dev->bus->parent == NULL && dev->devfn == 0) { if (dev->bus->parent == NULL && dev->devfn == 0) {
int i; int i;
......
...@@ -92,7 +92,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = { ...@@ -92,7 +92,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = {
}, },
}; };
static void __devinit acs5k_i2c_init(void) static void acs5k_i2c_init(void)
{ {
/* The gpio interface */ /* The gpio interface */
platform_device_register(&acs5k_i2c_device); platform_device_register(&acs5k_i2c_device);
......
...@@ -61,7 +61,7 @@ struct gen_pool *sram_get_gpool(char *pool_name) ...@@ -61,7 +61,7 @@ struct gen_pool *sram_get_gpool(char *pool_name)
} }
EXPORT_SYMBOL(sram_get_gpool); EXPORT_SYMBOL(sram_get_gpool);
static int __devinit sram_probe(struct platform_device *pdev) static int sram_probe(struct platform_device *pdev)
{ {
struct sram_platdata *pdata = pdev->dev.platform_data; struct sram_platdata *pdata = pdev->dev.platform_data;
struct sram_bank_info *info; struct sram_bank_info *info;
...@@ -125,7 +125,7 @@ static int __devinit sram_probe(struct platform_device *pdev) ...@@ -125,7 +125,7 @@ static int __devinit sram_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sram_remove(struct platform_device *pdev) static int sram_remove(struct platform_device *pdev)
{ {
struct sram_bank_info *info; struct sram_bank_info *info;
......
...@@ -120,7 +120,7 @@ int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2) ...@@ -120,7 +120,7 @@ int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2)
* and unknown state. This function should be called early to * and unknown state. This function should be called early to
* wait on the ARM9. * wait on the ARM9.
*/ */
void __devinit proc_comm_boot_wait(void) void proc_comm_boot_wait(void)
{ {
void __iomem *base = MSM_SHARED_RAM_BASE; void __iomem *base = MSM_SHARED_RAM_BASE;
......
...@@ -988,7 +988,7 @@ int smd_core_init(void) ...@@ -988,7 +988,7 @@ int smd_core_init(void)
return 0; return 0;
} }
static int __devinit msm_smd_probe(struct platform_device *pdev) static int msm_smd_probe(struct platform