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

Commit 5b5e76e9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

IA64: 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: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28eb0e46

arch/ia64/include/asm/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ extern int additional_cpus; 
#else

#define MAX_PXM_DOMAINS (256)

#endif

extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];

extern int pxm_to_nid_map[MAX_PXM_DOMAINS];

extern int __initdata nid_to_pxm_map[MAX_NUMNODES];

#endif

arch/ia64/include/asm/iosapic.h

+3 −8
Original line number Diff line number Diff line
@@ -87,18 +87,13 @@ static inline void iosapic_eoi(char __iomem *iosapic, u32 vector) 
}



extern void __init iosapic_system_init (int pcat_compat);

extern int __devinit iosapic_init (unsigned long address,

				    unsigned int gsi_base);

#ifdef CONFIG_HOTPLUG

extern int iosapic_init (unsigned long address, unsigned int gsi_base);

extern int iosapic_remove (unsigned int gsi_base);

#else

#define iosapic_remove(gsi_base)				(-EINVAL)

#endif /* CONFIG_HOTPLUG */

extern int gsi_to_irq (unsigned int gsi);

extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity,

				  unsigned long trigger);

extern void iosapic_unregister_intr (unsigned int irq);

extern void __devinit iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,

extern void iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,

				      unsigned long polarity,

				      unsigned long trigger);

extern int __init iosapic_register_platform_intr (u32 int_type,
@@ -109,7 +104,7 @@ extern int __init iosapic_register_platform_intr (u32 int_type, 
					   unsigned long trigger);



#ifdef CONFIG_NUMA

extern void __devinit map_iosapic_to_node (unsigned int, int);

extern void map_iosapic_to_node (unsigned int, int);

#endif

#else

#define iosapic_system_init(pcat_compat)			do { } while (0)

arch/ia64/include/asm/parport.h

+2 −3
Original line number Diff line number Diff line
@@ -9,10 +9,9 @@ 
#ifndef _ASM_IA64_PARPORT_H

#define _ASM_IA64_PARPORT_H 1



static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);

static int parport_pc_find_isa_ports(int autoirq, int autodma);



static int __devinit

parport_pc_find_nonpci_ports (int autoirq, int autodma)

static int parport_pc_find_nonpci_ports(int autoirq, int autodma)

{

	return parport_pc_find_isa_ports(autoirq, autodma);

}

arch/ia64/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ extern struct smp_boot_data { 
	int cpu_phys_id[NR_CPUS];

} smp_boot_data __initdata;



extern char no_int_routing __devinitdata;

extern char no_int_routing;



extern cpumask_t cpu_core_map[NR_CPUS];

DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) 
#define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32)



static int __initdata srat_num_cpus;	/* number of cpus */

static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];

static u32 pxm_flag[PXM_FLAG_LEN];

#define pxm_bit_set(bit)	(set_bit(bit,(void *)pxm_flag))

#define pxm_bit_test(bit)	(test_bit(bit,(void *)pxm_flag))

static struct acpi_table_slit __initdata *slit_table;
@@ -956,8 +956,8 @@ EXPORT_SYMBOL(acpi_unmap_lsapic); 
#endif				/* CONFIG_ACPI_HOTPLUG_CPU */



#ifdef CONFIG_ACPI_NUMA

static acpi_status __devinit

acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)

static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth,

				    void *context, void **ret)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;