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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -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;
|
||||
|
@@ -147,7 +147,7 @@ static struct iosapic_intr_info {
|
||||
unsigned char trigger : 1; /* trigger mode (see iosapic.h) */
|
||||
} iosapic_intr_info[NR_IRQS];
|
||||
|
||||
static unsigned char pcat_compat __devinitdata; /* 8259 compatibility flag */
|
||||
static unsigned char pcat_compat; /* 8259 compatibility flag */
|
||||
|
||||
static inline void
|
||||
iosapic_write(struct iosapic *iosapic, unsigned int reg, u32 val)
|
||||
@@ -914,10 +914,8 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
|
||||
/*
|
||||
* ACPI calls this when it finds an entry for a legacy ISA IRQ override.
|
||||
*/
|
||||
void __devinit
|
||||
iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
|
||||
unsigned long polarity,
|
||||
unsigned long trigger)
|
||||
void iosapic_override_isa_irq(unsigned int isa_irq, unsigned int gsi,
|
||||
unsigned long polarity, unsigned long trigger)
|
||||
{
|
||||
int vector, irq;
|
||||
unsigned int dest = cpu_physical_id(smp_processor_id());
|
||||
@@ -1012,8 +1010,7 @@ iosapic_check_gsi_range (unsigned int gsi_base, unsigned int ver)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit
|
||||
iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
|
||||
int iosapic_init(unsigned long phys_addr, unsigned int gsi_base)
|
||||
{
|
||||
int num_rte, err, index;
|
||||
unsigned int isa_irq, ver;
|
||||
@@ -1070,9 +1067,7 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
int
|
||||
iosapic_remove (unsigned int gsi_base)
|
||||
int iosapic_remove(unsigned int gsi_base)
|
||||
{
|
||||
int index, err = 0;
|
||||
unsigned long flags;
|
||||
@@ -1098,11 +1093,9 @@ iosapic_remove (unsigned int gsi_base)
|
||||
spin_unlock_irqrestore(&iosapic_lock, flags);
|
||||
return err;
|
||||
}
|
||||
#endif /* CONFIG_HOTPLUG */
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
void __devinit
|
||||
map_iosapic_to_node(unsigned int gsi_base, int node)
|
||||
void map_iosapic_to_node(unsigned int gsi_base, int node)
|
||||
{
|
||||
int index;
|
||||
|
||||
|
@@ -347,8 +347,7 @@ ia64_sync_itc (unsigned int master)
|
||||
/*
|
||||
* Ideally sets up per-cpu profiling hooks. Doesn't do much now...
|
||||
*/
|
||||
static inline void __devinit
|
||||
smp_setup_percpu_timer (void)
|
||||
static inline void smp_setup_percpu_timer(void)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -563,7 +562,7 @@ smp_prepare_cpus (unsigned int max_cpus)
|
||||
}
|
||||
}
|
||||
|
||||
void __devinit smp_prepare_boot_cpu(void)
|
||||
void smp_prepare_boot_cpu(void)
|
||||
{
|
||||
set_cpu_online(smp_processor_id(), true);
|
||||
cpu_set(smp_processor_id(), cpu_callin_map);
|
||||
@@ -713,8 +712,7 @@ smp_cpus_done (unsigned int dummy)
|
||||
(int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
|
||||
}
|
||||
|
||||
static inline void __devinit
|
||||
set_cpu_sibling_map(int cpu)
|
||||
static inline void set_cpu_sibling_map(int cpu)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -793,8 +791,7 @@ init_smp_config(void)
|
||||
* identify_siblings(cpu) gets called from identify_cpu. This populates the
|
||||
* information related to logical execution units in per_cpu_data structure.
|
||||
*/
|
||||
void __devinit
|
||||
identify_siblings(struct cpuinfo_ia64 *c)
|
||||
void identify_siblings(struct cpuinfo_ia64 *c)
|
||||
{
|
||||
long status;
|
||||
u16 pltid;
|
||||
|
@@ -243,8 +243,7 @@ static int __init nojitter_setup(char *str)
|
||||
__setup("nojitter", nojitter_setup);
|
||||
|
||||
|
||||
void __devinit
|
||||
ia64_init_itm (void)
|
||||
void ia64_init_itm(void)
|
||||
{
|
||||
unsigned long platform_base_freq, itc_freq;
|
||||
struct pal_freq_ratio itc_ratio, proc_ratio;
|
||||
|
Reference in New Issue
Block a user