Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

arch/arm/common/sa1111.c

+2 −3
Original line number Diff line number Diff line
@@ -686,8 +686,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
 *	%-EINVAL	no platform data passed

 *	%0		successful.

 */

static int __devinit

__sa1111_probe(struct device *me, struct resource *mem, int irq)

static int __sa1111_probe(struct device *me, struct resource *mem, int irq)

{

	struct sa1111_platform_data *pd = me->platform_data;

	struct sa1111 *sachip;
@@ -1011,7 +1010,7 @@ static int sa1111_resume(struct platform_device *dev) 
#define sa1111_resume  NULL

#endif



static int __devinit sa1111_probe(struct platform_device *pdev)

static int sa1111_probe(struct platform_device *pdev)

{

	struct resource *mem;

	int irq;

arch/arm/common/scoop.c

+3 −3
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int scoop_resume(struct platform_device *dev) 
#define scoop_resume	NULL

#endif



static int __devinit scoop_probe(struct platform_device *pdev)

static int scoop_probe(struct platform_device *pdev)

{

	struct scoop_dev *devptr;

	struct scoop_config *inf;
@@ -243,7 +243,7 @@ static int __devinit scoop_probe(struct platform_device *pdev) 
	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);

	int ret;
@@ -268,7 +268,7 @@ static int __devexit scoop_remove(struct platform_device *pdev) 


static struct platform_driver scoop_driver = {

	.probe		= scoop_probe,

	.remove		= __devexit_p(scoop_remove),

	.remove		= scoop_remove,

	.suspend	= scoop_suspend,

	.resume		= scoop_resume,

	.driver		= {

arch/arm/kernel/bios32.c

+8 −10
Original line number Diff line number Diff line
@@ -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

 * 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
@@ -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);



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].start = 0;
@@ -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

 * 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;
@@ -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.

 */

static void __devinit pci_fixup_ide_bases(struct pci_dev *dev)

static void pci_fixup_ide_bases(struct pci_dev *dev)

{

	struct resource *r;

	int i;
@@ -182,7 +182,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); 
/*

 * 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);

}
@@ -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

 * 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) {

		u32 base0, base1;
@@ -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);



static void __devinit pci_fixup_it8152(struct pci_dev *dev)

static void pci_fixup_it8152(struct pci_dev *dev)

{

	int i;

	/* fixup for ITE 8152 devices */
@@ -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",

		bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");

}

#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_fixup_bus);

#endif



/*

 * Swizzle the device pin each time we cross a bridge.  If a platform does
@@ -380,7 +378,7 @@ EXPORT_SYMBOL(pcibios_fixup_bus); 
 * PCI standard swizzle is implemented on plug-in cards and Cardbus based

 * 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;

	int slot, oldpin = *pin;

arch/arm/kernel/etm.c

+2 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static struct miscdevice etb_miscdev = { 
	.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;

	int ret = 0;
@@ -531,7 +531,7 @@ static ssize_t trace_mode_store(struct kobject *kobj, 
static struct kobj_attribute trace_mode_attr =

	__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;

	int ret = 0;

arch/arm/kernel/perf_event_cpu.c

+5 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) 
	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;

	for_each_possible_cpu(cpu) {
@@ -178,7 +178,7 @@ static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = { 
/*

 * 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-a9-pmu",	.data = armv7_a9_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[] = { 
	{},

};



static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = {

static struct platform_device_id cpu_pmu_plat_device_ids[] = {

	{.name = "arm-pmu"},

	{},

};
@@ -198,7 +198,7 @@ static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = { 
/*

 * 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();

	unsigned long cpuid = read_cpuid_id();
@@ -252,7 +252,7 @@ static int __devinit probe_current_pmu(struct arm_pmu *pmu) 
	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;

	int (*init_fn)(struct arm_pmu *);