leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IA64: drivers: remove __dev* attributes.

Browse Source 
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:
Greg Kroah-Hartman 2012-12-21 14:05:13 -08:00
parent 28eb0e4661
commit 5b5e76e9cb
15 changed files with 42 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/acpi.h
View File

@ -153,7 +153,7 @@ extern int additional_cpus;
#else #else
#define MAX_PXM_DOMAINS (256) #define MAX_PXM_DOMAINS (256)
#endif #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]; extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
#endif #endif

11
arch/ia64/include/asm/iosapic.h
View File

@ -87,18 +87,13 @@ static inline void iosapic_eoi(char __iomem *iosapic, u32 vector)
} }
extern void __init iosapic_system_init (int pcat_compat); extern void __init iosapic_system_init (int pcat_compat);
extern int __devinit iosapic_init (unsigned long address, extern int iosapic_init (unsigned long address, unsigned int gsi_base);
unsigned int gsi_base);
#ifdef CONFIG_HOTPLUG
extern int iosapic_remove (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 gsi_to_irq (unsigned int gsi);
extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity,
unsigned long trigger); unsigned long trigger);
extern void iosapic_unregister_intr (unsigned int irq); 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 polarity,
unsigned long trigger); unsigned long trigger);
extern int __init iosapic_register_platform_intr (u32 int_type, 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); unsigned long trigger);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
extern void __devinit map_iosapic_to_node (unsigned int, int); extern void map_iosapic_to_node (unsigned int, int);
#endif #endif
#else #else
#define iosapic_system_init(pcat_compat) do { } while (0) #define iosapic_system_init(pcat_compat) do { } while (0)

5
arch/ia64/include/asm/parport.h
View File

@ -9,10 +9,9 @@
#ifndef _ASM_IA64_PARPORT_H #ifndef _ASM_IA64_PARPORT_H
#define _ASM_IA64_PARPORT_H 1 #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 static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
parport_pc_find_nonpci_ports (int autoirq, int autodma)
{ {
return parport_pc_find_isa_ports(autoirq, autodma); return parport_pc_find_isa_ports(autoirq, autodma);
} }

2
arch/ia64/include/asm/smp.h
View File

@ -55,7 +55,7 @@ extern struct smp_boot_data {
int cpu_phys_id[NR_CPUS]; int cpu_phys_id[NR_CPUS];
} smp_boot_data __initdata; } smp_boot_data __initdata;
extern char no_int_routing __devinitdata; extern char no_int_routing;
extern cpumask_t cpu_core_map[NR_CPUS]; extern cpumask_t cpu_core_map[NR_CPUS];
DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);

6
arch/ia64/kernel/acpi.c
View File

@ -422,7 +422,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
#define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32) #define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32)
static int __initdata srat_num_cpus; /* number of cpus */ 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_set(bit) (set_bit(bit,(void *)pxm_flag))
#define pxm_bit_test(bit) (test_bit(bit,(void *)pxm_flag)) #define pxm_bit_test(bit) (test_bit(bit,(void *)pxm_flag))
static struct acpi_table_slit __initdata *slit_table; static struct acpi_table_slit __initdata *slit_table;
@ -956,8 +956,8 @@ EXPORT_SYMBOL(acpi_unmap_lsapic);
#endif /* CONFIG_ACPI_HOTPLUG_CPU */ #endif /* CONFIG_ACPI_HOTPLUG_CPU */
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
static acpi_status __devinit static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth,
acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) void *context, void **ret)
{ {
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *obj; union acpi_object *obj;

19
arch/ia64/kernel/iosapic.c
View File

@ -147,7 +147,7 @@ static struct iosapic_intr_info {
unsigned char trigger : 1; /* trigger mode (see iosapic.h) */ unsigned char trigger : 1; /* trigger mode (see iosapic.h) */
} iosapic_intr_info[NR_IRQS]; } 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 static inline void
iosapic_write(struct iosapic *iosapic, unsigned int reg, u32 val) 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. * ACPI calls this when it finds an entry for a legacy ISA IRQ override.
*/ */
void __devinit void iosapic_override_isa_irq(unsigned int isa_irq, unsigned int gsi,
iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, unsigned long polarity, unsigned long trigger)
unsigned long polarity,
unsigned long trigger)
{ {
int vector, irq; int vector, irq;
unsigned int dest = cpu_physical_id(smp_processor_id()); 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; return 0;
} }
int __devinit int iosapic_init(unsigned long phys_addr, unsigned int gsi_base)
iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
{ {
int num_rte, err, index; int num_rte, err, index;
unsigned int isa_irq, ver; unsigned int isa_irq, ver;
@ -1070,9 +1067,7 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG int iosapic_remove(unsigned int gsi_base)
int
iosapic_remove (unsigned int gsi_base)
{ {
int index, err = 0; int index, err = 0;
unsigned long flags; unsigned long flags;
@ -1098,11 +1093,9 @@ iosapic_remove (unsigned int gsi_base)
spin_unlock_irqrestore(&iosapic_lock, flags); spin_unlock_irqrestore(&iosapic_lock, flags);
return err; return err;
} }
#endif /* CONFIG_HOTPLUG */
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
void __devinit void map_iosapic_to_node(unsigned int gsi_base, int node)
map_iosapic_to_node(unsigned int gsi_base, int node)
{ {
int index; int index;

11
arch/ia64/kernel/smpboot.c
View File

@ -347,8 +347,7 @@ ia64_sync_itc (unsigned int master)
/* /*
* Ideally sets up per-cpu profiling hooks. Doesn't do much now... * Ideally sets up per-cpu profiling hooks. Doesn't do much now...
*/ */
static inline void __devinit static inline void smp_setup_percpu_timer(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); set_cpu_online(smp_processor_id(), true);
cpu_set(smp_processor_id(), cpu_callin_map); 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); (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
} }
static inline void __devinit static inline void set_cpu_sibling_map(int cpu)
set_cpu_sibling_map(int cpu)
{ {
int i; int i;
@ -793,8 +791,7 @@ init_smp_config(void)
* identify_siblings(cpu) gets called from identify_cpu. This populates the * identify_siblings(cpu) gets called from identify_cpu. This populates the
* information related to logical execution units in per_cpu_data structure. * information related to logical execution units in per_cpu_data structure.
*/ */
void __devinit void identify_siblings(struct cpuinfo_ia64 *c)
identify_siblings(struct cpuinfo_ia64 *c)
{ {
long status; long status;
u16 pltid; u16 pltid;

3
arch/ia64/kernel/time.c
View File

@ -243,8 +243,7 @@ static int __init nojitter_setup(char *str)
__setup("nojitter", nojitter_setup); __setup("nojitter", nojitter_setup);
void __devinit void ia64_init_itm(void)
ia64_init_itm (void)
{ {
unsigned long platform_base_freq, itc_freq; unsigned long platform_base_freq, itc_freq;
struct pal_freq_ratio itc_ratio, proc_ratio; struct pal_freq_ratio itc_ratio, proc_ratio;

5
arch/ia64/mm/init.c
View File

@ -294,11 +294,10 @@ setup_gate (void)
ia64_patch_gate(); ia64_patch_gate();
} }
void __devinit void ia64_mmu_init(void *my_cpu_data)
ia64_mmu_init (void *my_cpu_data)
{ {
unsigned long pta, impl_va_bits; unsigned long pta, impl_va_bits;
extern void __devinit tlb_init (void); extern void tlb_init(void);
#ifdef CONFIG_DISABLE_VHPT #ifdef CONFIG_DISABLE_VHPT
# define VHPT_ENABLE_BIT 0 # define VHPT_ENABLE_BIT 0

3
arch/ia64/mm/tlb.c
View File

@ -337,8 +337,7 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start,
} }
EXPORT_SYMBOL(flush_tlb_range); EXPORT_SYMBOL(flush_tlb_range);
void __devinit void ia64_tlb_init(void)
ia64_tlb_init (void)
{ {
ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */ ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */
u64 tr_pgbits; u64 tr_pgbits;

2
arch/ia64/pci/fixup.c
View File

@ -24,7 +24,7 @@
* video device at this point. * video device at this point.
*/ */
static void __devinit pci_fixup_video(struct pci_dev *pdev) static void pci_fixup_video(struct pci_dev *pdev)
{ {
struct pci_dev *bridge; struct pci_dev *bridge;
struct pci_bus *bus; struct pci_bus *bus;

31
arch/ia64/pci/pci.c
View File

@ -116,8 +116,7 @@ struct pci_ops pci_root_ops = {
/* Called by ACPI when it finds a new root bus. */ /* Called by ACPI when it finds a new root bus. */
static struct pci_controller * __devinit static struct pci_controller *alloc_pci_controller(int seg)
alloc_pci_controller (int seg)
{ {
struct pci_controller *controller; struct pci_controller *controller;
@ -165,8 +164,8 @@ new_space (u64 phys_base, int sparse)
return i; return i;
} }
static u64 __devinit static u64 add_io_space(struct pci_root_info *info,
add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr) struct acpi_resource_address64 *addr)
{ {
struct resource *resource; struct resource *resource;
char *name; char *name;
@ -226,8 +225,8 @@ out:
return ~0; return ~0;
} }
static acpi_status __devinit resource_to_window(struct acpi_resource *resource, static acpi_status resource_to_window(struct acpi_resource *resource,
struct acpi_resource_address64 *addr) struct acpi_resource_address64 *addr)
{ {
acpi_status status; acpi_status status;
@ -249,8 +248,7 @@ static acpi_status __devinit resource_to_window(struct acpi_resource *resource,
return AE_ERROR; return AE_ERROR;
} }
static acpi_status __devinit static acpi_status count_window(struct acpi_resource *resource, void *data)
count_window (struct acpi_resource *resource, void *data)
{ {
unsigned int *windows = (unsigned int *) data; unsigned int *windows = (unsigned int *) data;
struct acpi_resource_address64 addr; struct acpi_resource_address64 addr;
@ -263,7 +261,7 @@ count_window (struct acpi_resource *resource, void *data)
return AE_OK; return AE_OK;
} }
static __devinit acpi_status add_window(struct acpi_resource *res, void *data) static acpi_status add_window(struct acpi_resource *res, void *data)
{ {
struct pci_root_info *info = data; struct pci_root_info *info = data;
struct pci_window *window; struct pci_window *window;
@ -324,8 +322,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
return AE_OK; return AE_OK;
} }
struct pci_bus * __devinit struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
pci_acpi_scan_root(struct acpi_pci_root *root)
{ {
struct acpi_device *device = root->device; struct acpi_device *device = root->device;
int domain = root->segment; int domain = root->segment;
@ -396,7 +393,7 @@ out1:
return NULL; return NULL;
} }
static int __devinit is_valid_resource(struct pci_dev *dev, int idx) static int is_valid_resource(struct pci_dev *dev, int idx)
{ {
unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
struct resource *devr = &dev->resource[idx], *busr; struct resource *devr = &dev->resource[idx], *busr;
@ -414,8 +411,7 @@ static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
return 0; return 0;
} }
static void __devinit static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
{ {
int i; int i;
@ -427,13 +423,13 @@ pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
} }
} }
void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) void pcibios_fixup_device_resources(struct pci_dev *dev)
{ {
pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES); pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);
} }
EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources); EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev) static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
{ {
pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES); pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES);
} }
@ -441,8 +437,7 @@ static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev)
/* /*
* Called after each bus is probed, but before its children are examined. * Called after each bus is probed, but before its children are examined.
*/ */
void __devinit void pcibios_fixup_bus(struct pci_bus *b)
pcibios_fixup_bus (struct pci_bus *b)
{ {
struct pci_dev *dev; struct pci_dev *dev;

3
arch/ia64/sn/kernel/io_common.c
View File

@ -435,8 +435,7 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address)
geo_slot(geoid)); geo_slot(geoid));
} }
void __devinit void sn_pci_fixup_bus(struct pci_bus *bus)
sn_pci_fixup_bus(struct pci_bus *bus)
{ {
if (SN_ACPI_BASE_SUPPORT()) if (SN_ACPI_BASE_SUPPORT())

2
arch/ia64/sn/kernel/sn2/sn_hwperf.c
View File

@ -977,7 +977,7 @@ int sn_hwperf_get_nearest_node(cnodeid_t node,
return e; return e;
} }
static int __devinit sn_hwperf_misc_register_init(void) static int sn_hwperf_misc_register_init(void)
{ {
int e; int e;

5
arch/ia64/xen/irq_xen.c
View File

@ -273,9 +273,8 @@ xen_bind_early_percpu_irq(void)
*/ */
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
static int __devinit static int unbind_evtchn_callback(struct notifier_block *nfb,
unbind_evtchn_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
unsigned long action, void *hcpu)
{ {
unsigned int cpu = (unsigned long)hcpu; unsigned int cpu = (unsigned long)hcpu;