Skip to content

L
linux
Commit a18e3690 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

X86: 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, __devinitconst,
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: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Daniel Drake <dsd@laptop.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 351a102d
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 89 deletions
arch/x86/include/asm/parport.h
View file @ a18e3690
#ifndef _ASM_X86_PARPORT_H #ifndef _ASM_X86_PARPORT_H
#define _ASM_X86_PARPORT_H #define _ASM_X86_PARPORT_H
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); return parport_pc_find_isa_ports(autoirq, autodma);
} }
......
arch/x86/include/asm/pci_x86.h
View file @ a18e3690
...@@ -140,11 +140,10 @@ struct pci_mmcfg_region { ...@@ -140,11 +140,10 @@ struct pci_mmcfg_region {
extern int __init pci_mmcfg_arch_init(void); extern int __init pci_mmcfg_arch_init(void);
extern void __init pci_mmcfg_arch_free(void); extern void __init pci_mmcfg_arch_free(void);
extern int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg); extern int pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg);
extern void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg); extern void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg);
extern int __devinit pci_mmconfig_insert(struct device *dev, extern int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
u16 seg, u8 start, phys_addr_t addr);
u8 end, phys_addr_t addr);
extern int pci_mmconfig_delete(u16 seg, u8 start, u8 end); extern int pci_mmconfig_delete(u16 seg, u8 start, u8 end);
extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus); extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);
......
arch/x86/kernel/cpu/perf_event_intel_uncore.c
View file @ a18e3690
...@@ -2500,7 +2500,7 @@ static bool pcidrv_registered; ...@@ -2500,7 +2500,7 @@ static bool pcidrv_registered;
/* /*
* add a pci uncore device * add a pci uncore device
*/ */
static int __devinit uncore_pci_add(struct intel_uncore_type *type, struct pci_dev *pdev) static int uncore_pci_add(struct intel_uncore_type *type, struct pci_dev *pdev)
{ {
struct intel_uncore_pmu *pmu; struct intel_uncore_pmu *pmu;
struct intel_uncore_box *box; struct intel_uncore_box *box;
...@@ -2571,8 +2571,8 @@ static void uncore_pci_remove(struct pci_dev *pdev) ...@@ -2571,8 +2571,8 @@ static void uncore_pci_remove(struct pci_dev *pdev)
kfree(box); kfree(box);
} }
static int __devinit uncore_pci_probe(struct pci_dev *pdev, static int uncore_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct intel_uncore_type *type; struct intel_uncore_type *type;
......
arch/x86/kernel/pci-dma.c
View file @ a18e3690
...@@ -265,7 +265,7 @@ rootfs_initcall(pci_iommu_init); ...@@ -265,7 +265,7 @@ rootfs_initcall(pci_iommu_init);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* Many VIA bridges seem to corrupt data for DAC. Disable it here */ /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
static __devinit void via_no_dac(struct pci_dev *dev) static void via_no_dac(struct pci_dev *dev)
{ {
if (forbid_dac == 0) { if (forbid_dac == 0) {
dev_info(&dev->dev, "disabling DAC on VIA PCI bridge\n"); dev_info(&dev->dev, "disabling DAC on VIA PCI bridge\n");
......
arch/x86/kernel/quirks.c
View file @ a18e3690
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI) #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
static void __devinit quirk_intel_irqbalance(struct pci_dev *dev) static void quirk_intel_irqbalance(struct pci_dev *dev)
{ {
u8 config; u8 config;
u16 word; u16 word;
...@@ -512,7 +512,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, ...@@ -512,7 +512,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
#if defined(CONFIG_PCI) && defined(CONFIG_NUMA) #if defined(CONFIG_PCI) && defined(CONFIG_NUMA)
/* Set correct numa_node information for AMD NB functions */ /* Set correct numa_node information for AMD NB functions */
static void __devinit quirk_amd_nb_node(struct pci_dev *dev) static void quirk_amd_nb_node(struct pci_dev *dev)
{ {
struct pci_dev *nb_ht; struct pci_dev *nb_ht;
unsigned int devfn; unsigned int devfn;
......
arch/x86/lib/delay.c
View file @ a18e3690
...@@ -98,7 +98,7 @@ void use_tsc_delay(void) ...@@ -98,7 +98,7 @@ void use_tsc_delay(void)
delay_fn = delay_tsc; delay_fn = delay_tsc;
} }
int __devinit read_current_timer(unsigned long *timer_val) int read_current_timer(unsigned long *timer_val)
{ {
if (delay_fn == delay_tsc) { if (delay_fn == delay_tsc) {
rdtscll(*timer_val); rdtscll(*timer_val);
......
arch/x86/pci/acpi.c
View file @ a18e3690
...@@ -145,7 +145,7 @@ void __init pci_acpi_crs_quirks(void) ...@@ -145,7 +145,7 @@ void __init pci_acpi_crs_quirks(void)
} }
#ifdef CONFIG_PCI_MMCONFIG #ifdef CONFIG_PCI_MMCONFIG
static int __devinit check_segment(u16 seg, struct device *dev, char *estr) static int check_segment(u16 seg, struct device *dev, char *estr)
{ {
if (seg) { if (seg) {
dev_err(dev, dev_err(dev,
...@@ -168,9 +168,8 @@ static int __devinit check_segment(u16 seg, struct device *dev, char *estr) ...@@ -168,9 +168,8 @@ static int __devinit check_segment(u16 seg, struct device *dev, char *estr)
return 0; return 0;
} }
static int __devinit setup_mcfg_map(struct pci_root_info *info, static int setup_mcfg_map(struct pci_root_info *info, u16 seg, u8 start,
u16 seg, u8 start, u8 end, u8 end, phys_addr_t addr)
phys_addr_t addr)
{ {
int result; int result;
struct device *dev = &info->bridge->dev; struct device *dev = &info->bridge->dev;
...@@ -208,7 +207,7 @@ static void teardown_mcfg_map(struct pci_root_info *info) ...@@ -208,7 +207,7 @@ static void teardown_mcfg_map(struct pci_root_info *info)
} }
} }
#else #else
static int __devinit setup_mcfg_map(struct pci_root_info *info, static int setup_mcfg_map(struct pci_root_info *info,
u16 seg, u8 start, u8 end, u16 seg, u8 start, u8 end,
phys_addr_t addr) phys_addr_t addr)
{ {
...@@ -474,7 +473,7 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device, ...@@ -474,7 +473,7 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
info); info);
} }
struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
{ {
struct acpi_device *device = root->device; struct acpi_device *device = root->device;
struct pci_root_info *info = NULL; struct pci_root_info *info = NULL;
......
arch/x86/pci/bus_numa.c
View file @ a18e3690
...@@ -93,8 +93,8 @@ struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max, ...@@ -93,8 +93,8 @@ struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max,
return info; return info;
} }
void __devinit update_res(struct pci_root_info *info, resource_size_t start, void update_res(struct pci_root_info *info, resource_size_t start,
resource_size_t end, unsigned long flags, int merge) resource_size_t end, unsigned long flags, int merge)
{ {
struct resource *res; struct resource *res;
struct pci_root_res *root_res; struct pci_root_res *root_res;
......
arch/x86/pci/common.c
View file @ a18e3690
...@@ -81,14 +81,14 @@ struct pci_ops pci_root_ops = { ...@@ -81,14 +81,14 @@ struct pci_ops pci_root_ops = {
*/ */
DEFINE_RAW_SPINLOCK(pci_config_lock); DEFINE_RAW_SPINLOCK(pci_config_lock);
static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d) static int can_skip_ioresource_align(const struct dmi_system_id *d)
{ {
pci_probe |= PCI_CAN_SKIP_ISA_ALIGN; pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident); printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident);
return 0; return 0;
} }
static const struct dmi_system_id can_skip_pciprobe_dmi_table[] __devinitconst = { static const struct dmi_system_id can_skip_pciprobe_dmi_table[] = {
/* /*
* Systems where PCI IO resource ISA alignment can be skipped * Systems where PCI IO resource ISA alignment can be skipped
* when the ISA enable bit in the bridge control is not set * when the ISA enable bit in the bridge control is not set
...@@ -125,7 +125,7 @@ void __init dmi_check_skip_isa_align(void) ...@@ -125,7 +125,7 @@ void __init dmi_check_skip_isa_align(void)
dmi_check_system(can_skip_pciprobe_dmi_table); dmi_check_system(can_skip_pciprobe_dmi_table);
} }
static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) static void pcibios_fixup_device_resources(struct pci_dev *dev)
{ {
struct resource *rom_r = &dev->resource[PCI_ROM_RESOURCE]; struct resource *rom_r = &dev->resource[PCI_ROM_RESOURCE];
struct resource *bar_r; struct resource *bar_r;
...@@ -162,7 +162,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) ...@@ -162,7 +162,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
* are examined. * are examined.
*/ */
void __devinit pcibios_fixup_bus(struct pci_bus *b) void pcibios_fixup_bus(struct pci_bus *b)
{ {
struct pci_dev *dev; struct pci_dev *dev;
...@@ -176,7 +176,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) ...@@ -176,7 +176,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b)
* on the kernel command line (which was parsed earlier). * on the kernel command line (which was parsed earlier).
*/ */
static int __devinit set_bf_sort(const struct dmi_system_id *d) static int set_bf_sort(const struct dmi_system_id *d)
{ {
if (pci_bf_sort == pci_bf_sort_default) { if (pci_bf_sort == pci_bf_sort_default) {
pci_bf_sort = pci_dmi_bf; pci_bf_sort = pci_dmi_bf;
...@@ -185,7 +185,7 @@ static int __devinit set_bf_sort(const struct dmi_system_id *d) ...@@ -185,7 +185,7 @@ static int __devinit set_bf_sort(const struct dmi_system_id *d)
return 0; return 0;
} }
static void __devinit read_dmi_type_b1(const struct dmi_header *dm, static void read_dmi_type_b1(const struct dmi_header *dm,
void *private_data) void *private_data)
{ {
u8 *d = (u8 *)dm + 4; u8 *d = (u8 *)dm + 4;
...@@ -207,7 +207,7 @@ static void __devinit read_dmi_type_b1(const struct dmi_header *dm, ...@@ -207,7 +207,7 @@ static void __devinit read_dmi_type_b1(const struct dmi_header *dm,
} }
} }
static int __devinit find_sort_method(const struct dmi_system_id *d) static int find_sort_method(const struct dmi_system_id *d)
{ {
dmi_walk(read_dmi_type_b1, NULL); dmi_walk(read_dmi_type_b1, NULL);
...@@ -222,7 +222,7 @@ static int __devinit find_sort_method(const struct dmi_system_id *d) ...@@ -222,7 +222,7 @@ static int __devinit find_sort_method(const struct dmi_system_id *d)
* Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus) * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)
*/ */
#ifdef __i386__ #ifdef __i386__
static int __devinit assign_all_busses(const struct dmi_system_id *d) static int assign_all_busses(const struct dmi_system_id *d)
{ {
pci_probe |= PCI_ASSIGN_ALL_BUSSES; pci_probe |= PCI_ASSIGN_ALL_BUSSES;
printk(KERN_INFO "%s detected: enabling PCI bus# renumbering" printk(KERN_INFO "%s detected: enabling PCI bus# renumbering"
...@@ -231,7 +231,7 @@ static int __devinit assign_all_busses(const struct dmi_system_id *d) ...@@ -231,7 +231,7 @@ static int __devinit assign_all_busses(const struct dmi_system_id *d)
} }
#endif #endif
static int __devinit set_scan_all(const struct dmi_system_id *d) static int set_scan_all(const struct dmi_system_id *d)
{ {
printk(KERN_INFO "PCI: %s detected, enabling pci=pcie_scan_all\n", printk(KERN_INFO "PCI: %s detected, enabling pci=pcie_scan_all\n",
d->ident); d->ident);
...@@ -239,7 +239,7 @@ static int __devinit set_scan_all(const struct dmi_system_id *d) ...@@ -239,7 +239,7 @@ static int __devinit set_scan_all(const struct dmi_system_id *d)
return 0; return 0;
} }
static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { static const struct dmi_system_id pciprobe_dmi_table[] = {
#ifdef __i386__ #ifdef __i386__
/* /*
* Laptops which need pci=assign-busses to see Cardbus cards * Laptops which need pci=assign-busses to see Cardbus cards
...@@ -446,7 +446,7 @@ void __init dmi_check_pciprobe(void) ...@@ -446,7 +446,7 @@ void __init dmi_check_pciprobe(void)
dmi_check_system(pciprobe_dmi_table); dmi_check_system(pciprobe_dmi_table);
} }
struct pci_bus * __devinit pcibios_scan_root(int busnum) struct pci_bus *pcibios_scan_root(int busnum)
{ {
struct pci_bus *bus = NULL; struct pci_bus *bus = NULL;
...@@ -665,7 +665,7 @@ int pci_ext_cfg_avail(void) ...@@ -665,7 +665,7 @@ int pci_ext_cfg_avail(void)
return 0; return 0;
} }
struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node) struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node)
{ {
LIST_HEAD(resources); LIST_HEAD(resources);
struct pci_bus *bus = NULL; struct pci_bus *bus = NULL;
...@@ -693,7 +693,7 @@ struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops, ...@@ -693,7 +693,7 @@ struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops,
return bus; return bus;
} }
struct pci_bus * __devinit pci_scan_bus_with_sysdata(int busno) struct pci_bus *pci_scan_bus_with_sysdata(int busno)
{ {
return pci_scan_bus_on_node(busno, &pci_root_ops, -1); return pci_scan_bus_on_node(busno, &pci_root_ops, -1);
} }
......
arch/x86/pci/fixup.c
View file @ a18e3690
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/vgaarb.h> #include <linux/vgaarb.h>
#include <asm/pci_x86.h> #include <asm/pci_x86.h>
static void __devinit pci_fixup_i450nx(struct pci_dev *d) static void pci_fixup_i450nx(struct pci_dev *d)
{ {
/* /*
* i450NX -- Find and scan all secondary buses on all PXB's. * i450NX -- Find and scan all secondary buses on all PXB's.
...@@ -34,7 +34,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d) ...@@ -34,7 +34,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
static void __devinit pci_fixup_i450gx(struct pci_dev *d) static void pci_fixup_i450gx(struct pci_dev *d)
{ {
/* /*
* i450GX and i450KX -- Find and scan all secondary buses. * i450GX and i450KX -- Find and scan all secondary buses.
...@@ -48,7 +48,7 @@ static void __devinit pci_fixup_i450gx(struct pci_dev *d) ...@@ -48,7 +48,7 @@ static void __devinit pci_fixup_i450gx(struct pci_dev *d)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx);
static void __devinit pci_fixup_umc_ide(struct pci_dev *d) static void pci_fixup_umc_ide(struct pci_dev *d)
{ {
/* /*
* UM8886BF IDE controller sets region type bits incorrectly, * UM8886BF IDE controller sets region type bits incorrectly,
...@@ -62,7 +62,7 @@ static void __devinit pci_fixup_umc_ide(struct pci_dev *d) ...@@ -62,7 +62,7 @@ static void __devinit pci_fixup_umc_ide(struct pci_dev *d)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide);
static void __devinit pci_fixup_ncr53c810(struct pci_dev *d) static void pci_fixup_ncr53c810(struct pci_dev *d)
{ {
/* /*
* NCR 53C810 returns class code 0 (at least on some systems). * NCR 53C810 returns class code 0 (at least on some systems).
...@@ -75,7 +75,7 @@ static void __devinit pci_fixup_ncr53c810(struct pci_dev *d) ...@@ -75,7 +75,7 @@ static void __devinit pci_fixup_ncr53c810(struct pci_dev *d)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810);
static void __devinit pci_fixup_latency(struct pci_dev *d) static void pci_fixup_latency(struct pci_dev *d)
{ {
/* /*
* SiS 5597 and 5598 chipsets require latency timer set to * SiS 5597 and 5598 chipsets require latency timer set to
...@@ -87,7 +87,7 @@ static void __devinit pci_fixup_latency(struct pci_dev *d) ...@@ -87,7 +87,7 @@ static void __devinit pci_fixup_latency(struct pci_dev *d)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, pci_fixup_latency); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, pci_fixup_latency);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5598, pci_fixup_latency); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5598, pci_fixup_latency);
static void __devinit pci_fixup_piix4_acpi(struct pci_dev *d) static void pci_fixup_piix4_acpi(struct pci_dev *d)
{ {
/* /*
* PIIX4 ACPI device: hardwired IRQ9 * PIIX4 ACPI device: hardwired IRQ9
...@@ -163,7 +163,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_ ...@@ -163,7 +163,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_
* system to PCI bus no matter what are their window settings, so they are * system to PCI bus no matter what are their window settings, so they are
* "transparent" (or subtractive decoding) from programmers point of view. * "transparent" (or subtractive decoding) from programmers point of view.
*/ */
static void __devinit pci_fixup_transparent_bridge(struct pci_dev *dev) static void pci_fixup_transparent_bridge(struct pci_dev *dev)
{ {
if ((dev->device & 0xff00) == 0x2400) if ((dev->device & 0xff00) == 0x2400)
dev->transparent = 1; dev->transparent = 1;
...@@ -317,7 +317,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC1, pcie_r ...@@ -317,7 +317,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC1, pcie_r
* 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;
...@@ -357,7 +357,7 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, ...@@ -357,7 +357,7 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video); PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
static const struct dmi_system_id __devinitconst msi_k8t_dmi_table[] = { static const struct dmi_system_id msi_k8t_dmi_table[] = {
{ {
.ident = "MSI-K8T-Neo2Fir", .ident = "MSI-K8T-Neo2Fir",
.matches = { .matches = {
...@@ -378,7 +378,7 @@ static const struct dmi_system_id __devinitconst msi_k8t_dmi_table[] = { ...@@ -378,7 +378,7 @@ static const struct dmi_system_id __devinitconst msi_k8t_dmi_table[] = {
* The soundcard is only enabled, if the mainborad is identified * The soundcard is only enabled, if the mainborad is identified
* via DMI-tables and the soundcard is detected to be off. * via DMI-tables and the soundcard is detected to be off.
*/ */
static void __devinit pci_fixup_msi_k8t_onboard_sound(struct pci_dev *dev) static void pci_fixup_msi_k8t_onboard_sound(struct pci_dev *dev)
{ {
unsigned char val; unsigned char val;
if (!dmi_check_system(msi_k8t_dmi_table)) if (!dmi_check_system(msi_k8t_dmi_table))
...@@ -414,7 +414,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, ...@@ -414,7 +414,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237,
*/ */
static u16 toshiba_line_size; static u16 toshiba_line_size;
static const struct dmi_system_id __devinitconst toshiba_ohci1394_dmi_table[] = { static const struct dmi_system_id toshiba_ohci1394_dmi_table[] = {
{ {
.ident = "Toshiba PS5 based laptop", .ident = "Toshiba PS5 based laptop",
.matches = { .matches = {
...@@ -439,7 +439,7 @@ static const struct dmi_system_id __devinitconst toshiba_ohci1394_dmi_table[] = ...@@ -439,7 +439,7 @@ static const struct dmi_system_id __devinitconst toshiba_ohci1394_dmi_table[] =
{ } { }
}; };
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) static void pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
{ {
if (!dmi_check_system(toshiba_ohci1394_dmi_table)) if (!dmi_check_system(toshiba_ohci1394_dmi_table))
return; /* only applies to certain Toshibas (so far) */ return; /* only applies to certain Toshibas (so far) */
...@@ -450,7 +450,7 @@ static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) ...@@ -450,7 +450,7 @@ static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, 0x8032, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, 0x8032,
pci_pre_fixup_toshiba_ohci1394); pci_pre_fixup_toshiba_ohci1394);
static void __devinit pci_post_fixup_toshiba_ohci1394(struct pci_dev *dev) static void pci_post_fixup_toshiba_ohci1394(struct pci_dev *dev)
{ {
if (!dmi_check_system(toshiba_ohci1394_dmi_table)) if (!dmi_check_system(toshiba_ohci1394_dmi_table))
return; /* only applies to certain Toshibas (so far) */ return; /* only applies to certain Toshibas (so far) */
...@@ -488,7 +488,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, ...@@ -488,7 +488,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,
* Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller: * Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller:
* prevent update of the BAR0, which doesn't look like a normal BAR. * prevent update of the BAR0, which doesn't look like a normal BAR.
*/ */
static void __devinit pci_siemens_interrupt_controller(struct pci_dev *dev) static void pci_siemens_interrupt_controller(struct pci_dev *dev)
{ {
dev->resource[0].flags |= IORESOURCE_PCI_FIXED; dev->resource[0].flags |= IORESOURCE_PCI_FIXED;
} }
...@@ -531,7 +531,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar); ...@@ -531,7 +531,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar);
* *
* Match off the LPC and svid/sdid (older kernels lose the bridge subvendor) * Match off the LPC and svid/sdid (older kernels lose the bridge subvendor)
*/ */
static void __devinit twinhead_reserve_killing_zone(struct pci_dev *dev) static void twinhead_reserve_killing_zone(struct pci_dev *dev)
{ {
if (dev->subsystem_vendor == 0x14FF && dev->subsystem_device == 0xA003) { if (dev->subsystem_vendor == 0x14FF && dev->subsystem_device == 0xA003) {
pr_info("Reserving memory on Twinhead H12Y\n"); pr_info("Reserving memory on Twinhead H12Y\n");
......
arch/x86/pci/legacy.c
View file @ a18e3690
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Discover remaining PCI buses in case there are peer host bridges. * Discover remaining PCI buses in case there are peer host bridges.
* We use the number of last PCI bus provided by the PCI BIOS. * We use the number of last PCI bus provided by the PCI BIOS.
*/ */
static void __devinit pcibios_fixup_peer_bridges(void) static void pcibios_fixup_peer_bridges(void)
{ {
int n; int n;
...@@ -34,7 +34,7 @@ int __init pci_legacy_init(void) ...@@ -34,7 +34,7 @@ int __init pci_legacy_init(void)
return 0; return 0;
} }
void __devinit pcibios_scan_specific_bus(int busn) void pcibios_scan_specific_bus(int busn)
{ {
int devfn; int devfn;
long node; long node;
......
arch/x86/pci/mmconfig-shared.c
View file @ a18e3690
...@@ -49,7 +49,7 @@ static __init void free_all_mmcfg(void) ...@@ -49,7 +49,7 @@ static __init void free_all_mmcfg(void)
pci_mmconfig_remove(cfg); pci_mmconfig_remove(cfg);
} }
static __devinit void list_add_sorted(struct pci_mmcfg_region *new) static void list_add_sorted(struct pci_mmcfg_region *new)
{ {
struct pci_mmcfg_region *cfg; struct pci_mmcfg_region *cfg;
...@@ -65,9 +65,8 @@ static __devinit void list_add_sorted(struct pci_mmcfg_region *new) ...@@ -65,9 +65,8 @@ static __devinit void list_add_sorted(struct pci_mmcfg_region *new)
list_add_tail_rcu(&new->list, &pci_mmcfg_list); list_add_tail_rcu(&new->list, &pci_mmcfg_list);
} }
static __devinit struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, static struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start,
int start, int end, u64 addr)
int end, u64 addr)
{ {
struct pci_mmcfg_region *new; struct pci_mmcfg_region *new;
struct resource *res; struct resource *res;
...@@ -371,8 +370,7 @@ static int __init pci_mmcfg_check_hostbridge(void) ...@@ -371,8 +370,7 @@ static int __init pci_mmcfg_check_hostbridge(void)
return !list_empty(&pci_mmcfg_list); return !list_empty(&pci_mmcfg_list);
} }
static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res, static acpi_status check_mcfg_resource(struct acpi_resource *res, void *data)
void *data)
{ {
struct resource *mcfg_res = data; struct resource *mcfg_res = data;
struct acpi_resource_address64 address; struct acpi_resource_address64 address;
...@@ -408,8 +406,8 @@ static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res, ...@@ -408,8 +406,8 @@ static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res,
return AE_OK; return AE_OK;
} }
static acpi_status __devinit find_mboard_resource(acpi_handle handle, u32 lvl, static acpi_status find_mboard_resource(acpi_handle handle, u32 lvl,
void *context, void **rv) void *context, void **rv)
{ {
struct resource *mcfg_res = context; struct resource *mcfg_res = context;
...@@ -422,7 +420,7 @@ static acpi_status __devinit find_mboard_resource(acpi_handle handle, u32 lvl, ...@@ -422,7 +420,7 @@ static acpi_status __devinit find_mboard_resource(acpi_handle handle, u32 lvl,
return AE_OK; return AE_OK;
} }
static int __devinit is_acpi_reserved(u64 start, u64 end, unsigned not_used) static int is_acpi_reserved(u64 start, u64 end, unsigned not_used)
{ {
struct resource mcfg_res; struct resource mcfg_res;
...@@ -693,9 +691,8 @@ static int __init pci_mmcfg_late_insert_resources(void) ...@@ -693,9 +691,8 @@ static int __init pci_mmcfg_late_insert_resources(void)
late_initcall(pci_mmcfg_late_insert_resources); late_initcall(pci_mmcfg_late_insert_resources);
/* Add MMCFG information for host bridges */ /* Add MMCFG information for host bridges */
int __devinit pci_mmconfig_insert(struct device *dev, int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
u16 seg, u8 start, u8 end, phys_addr_t addr)
phys_addr_t addr)
{ {
int rc; int rc;
struct resource *tmp = NULL; struct resource *tmp = NULL;
......
arch/x86/pci/mmconfig_32.c
View file @ a18e3690
...@@ -142,7 +142,7 @@ void __init pci_mmcfg_arch_free(void) ...@@ -142,7 +142,7 @@ void __init pci_mmcfg_arch_free(void)
{ {
} }
int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg) int pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg)
{ {
return 0; return 0;
} }
......
arch/x86/pci/mmconfig_64.c
View file @ a18e3690
...@@ -95,7 +95,7 @@ const struct pci_raw_ops pci_mmcfg = { ...@@ -95,7 +95,7 @@ const struct pci_raw_ops pci_mmcfg = {
.write = pci_mmcfg_write, .write = pci_mmcfg_write,
}; };
static void __iomem * __devinit mcfg_ioremap(struct pci_mmcfg_region *cfg) static void __iomem *mcfg_ioremap(struct pci_mmcfg_region *cfg)
{ {
void __iomem *addr; void __iomem *addr;
u64 start, size; u64 start, size;
...@@ -133,7 +133,7 @@ void __init pci_mmcfg_arch_free(void) ...@@ -133,7 +133,7 @@ void __init pci_mmcfg_arch_free(void)
pci_mmcfg_arch_unmap(cfg); pci_mmcfg_arch_unmap(cfg);
} }
int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg) int pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg)
{ {
cfg->virt = mcfg_ioremap(cfg); cfg->virt = mcfg_ioremap(cfg);
if (!cfg->virt) { if (!cfg->virt) {
......
arch/x86/pci/mrst.c
View file @ a18e3690
...@@ -247,7 +247,7 @@ int __init pci_mrst_init(void) ...@@ -247,7 +247,7 @@ int __init pci_mrst_init(void)
/* Langwell devices are not true pci devices, they are not subject to 10 ms /* Langwell devices are not true pci devices, they are not subject to 10 ms
* d3 to d0 delay required by pci spec. * d3 to d0 delay required by pci spec.
*/ */
static void __devinit pci_d3delay_fixup(struct pci_dev *dev) static void pci_d3delay_fixup(struct pci_dev *dev)
{ {
/* PCI fixups are effectively decided compile time. If we have a dual /* PCI fixups are effectively decided compile time. If we have a dual
SoC/non-SoC kernel we don't want to mangle d3 on non SoC devices */ SoC/non-SoC kernel we don't want to mangle d3 on non SoC devices */
...@@ -262,7 +262,7 @@ static void __devinit pci_d3delay_fixup(struct pci_dev *dev) ...@@ -262,7 +262,7 @@ static void __devinit pci_d3delay_fixup(struct pci_dev *dev)
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup);
static void __devinit mrst_power_off_unused_dev(struct pci_dev *dev) static void mrst_power_off_unused_dev(struct pci_dev *dev)
{ {
pci_set_power_state(dev, PCI_D3hot); pci_set_power_state(dev, PCI_D3hot);
} }
...@@ -275,7 +275,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0815, mrst_power_off_unused_dev); ...@@ -275,7 +275,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0815, mrst_power_off_unused_dev);
/* /*
* Langwell devices reside at fixed offsets, don't try to move them. * Langwell devices reside at fixed offsets, don't try to move them.
*/ */
static void __devinit pci_fixed_bar_fixup(struct pci_dev *dev) static void pci_fixed_bar_fixup(struct pci_dev *dev)
{ {
unsigned long offset; unsigned long offset;
u32 size; u32 size;
......
arch/x86/pci/numaq_32.c
View file @ a18e3690
...@@ -116,7 +116,7 @@ static const struct pci_raw_ops pci_direct_conf1_mq = { ...@@ -116,7 +116,7 @@ static const struct pci_raw_ops pci_direct_conf1_mq = {
}; };
static void __devinit pci_fixup_i450nx(struct pci_dev *d) static void pci_fixup_i450nx(struct pci_dev *d)
{ {
/* /*
* i450NX -- Find and scan all secondary buses on all PXB's. * i450NX -- Find and scan all secondary buses on all PXB's.
......
arch/x86/pci/pcbios.c
View file @ a18e3690
...@@ -124,7 +124,7 @@ static struct { ...@@ -124,7 +124,7 @@ static struct {
static int pci_bios_present; static int pci_bios_present;
static int __devinit check_pcibios(void) static int check_pcibios(void)
{ {
u32 signature, eax, ebx, ecx; u32 signature, eax, ebx, ecx;
u8 status, major_ver, minor_ver, hw_mech; u8 status, major_ver, minor_ver, hw_mech;
...@@ -312,7 +312,7 @@ static const struct pci_raw_ops pci_bios_access = { ...@@ -312,7 +312,7 @@ static const struct pci_raw_ops pci_bios_access = {
* Try to find PCI BIOS. * Try to find PCI BIOS.
*/ */
static const struct pci_raw_ops * __devinit pci_find_bios(void) static const struct pci_raw_ops *pci_find_bios(void)
{ {
union bios32 *check; union bios32 *check;
unsigned char sum; unsigned char sum;
......
arch/x86/platform/mrst/mrst.c
View file @ a18e3690
...@@ -782,7 +782,7 @@ BLOCKING_NOTIFIER_HEAD(intel_scu_notifier); ...@@ -782,7 +782,7 @@ BLOCKING_NOTIFIER_HEAD(intel_scu_notifier);
EXPORT_SYMBOL_GPL(intel_scu_notifier); EXPORT_SYMBOL_GPL(intel_scu_notifier);
/* Called by IPC driver */ /* Called by IPC driver */
void __devinit intel_scu_devices_create(void) void intel_scu_devices_create(void)
{ {
int i; int i;
......
arch/x86/platform/olpc/olpc-xo1-pm.c
View file @ a18e3690
...@@ -121,7 +121,7 @@ static const struct platform_suspend_ops xo1_suspend_ops = { ...@@ -121,7 +121,7 @@ static const struct platform_suspend_ops xo1_suspend_ops = {
.enter = xo1_power_state_enter, .enter = xo1_power_state_enter,
}; };
static int __devinit xo1_pm_probe(struct platform_device *pdev) static int xo1_pm_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
int err; int err;
...@@ -154,7 +154,7 @@ static int __devinit xo1_pm_probe(struct platform_device *pdev) ...@@ -154,7 +154,7 @@ static int __devinit xo1_pm_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit xo1_pm_remove(struct platform_device *pdev) static int xo1_pm_remove(struct platform_device *pdev)
{ {
mfd_cell_disable(pdev); mfd_cell_disable(pdev);
...@@ -173,7 +173,7 @@ static struct platform_driver cs5535_pms_driver = { ...@@ -173,7 +173,7 @@ static struct platform_driver cs5535_pms_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = xo1_pm_probe, .probe = xo1_pm_probe,
.remove = __devexit_p(xo1_pm_remove), .remove = xo1_pm_remove,
}; };
static struct platform_driver cs5535_acpi_driver = { static struct platform_driver cs5535_acpi_driver = {
...@@ -182,7 +182,7 @@ static struct platform_driver cs5535_acpi_driver = { ...@@ -182,7 +182,7 @@ static struct platform_driver cs5535_acpi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = xo1_pm_probe, .probe = xo1_pm_probe,
.remove = __devexit_p(xo1_pm_remove), .remove = xo1_pm_remove,
}; };
static int __init xo1_pm_init(void) static int __init xo1_pm_init(void)
......
arch/x86/platform/olpc/olpc-xo1-sci.c
View file @ a18e3690
...@@ -309,7 +309,7 @@ static int xo1_sci_resume(struct platform_device *pdev) ...@@ -309,7 +309,7 @@ static int xo1_sci_resume(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit setup_sci_interrupt(struct platform_device *pdev) static int setup_sci_interrupt(struct platform_device *pdev)
{ {
u32 lo, hi; u32 lo, hi;
u32 sts; u32 sts;
...@@ -351,7 +351,7 @@ static int __devinit setup_sci_interrupt(struct platform_device *pdev) ...@@ -351,7 +351,7 @@ static int __devinit setup_sci_interrupt(struct platform_device *pdev)
return r; return r;
} }
static int __devinit setup_ec_sci(void) static int setup_ec_sci(void)
{ {
int r; int r;
...@@ -395,7 +395,7 @@ static void free_ec_sci(void) ...@@ -395,7 +395,7 @@ static void free_ec_sci(void)
gpio_free(OLPC_GPIO_ECSCI); gpio_free(OLPC_GPIO_ECSCI);
} }
static int __devinit setup_lid_events(void) static int setup_lid_events(void)
{ {
int r; int r;
...@@ -432,7 +432,7 @@ static void free_lid_events(void) ...@@ -432,7 +432,7 @@ static void free_lid_events(void)
gpio_free(OLPC_GPIO_LID); gpio_free(OLPC_GPIO_LID);
} }
static int __devinit setup_power_button(struct platform_device *pdev) static int setup_power_button(struct platform_device *pdev)
{ {
int r; int r;
...@@ -463,7 +463,7 @@ static void free_power_button(void) ...@@ -463,7 +463,7 @@ static void free_power_button(void)
input_free_device(power_button_idev); input_free_device(power_button_idev);
} }
static int __devinit setup_ebook_switch(struct platform_device *pdev) static int setup_ebook_switch(struct platform_device *pdev)
{ {
int r; int r;
...@@ -494,7 +494,7 @@ static void free_ebook_switch(void) ...@@ -494,7 +494,7 @@ static void free_ebook_switch(void)
input_free_device(ebook_switch_idev); input_free_device(ebook_switch_idev);
} }
static int __devinit setup_lid_switch(struct platform_device *pdev) static int setup_lid_switch(struct platform_device *pdev)
{ {
int r; int r;
...@@ -538,7 +538,7 @@ static void free_lid_switch(void) ...@@ -538,7 +538,7 @@ static void free_lid_switch(void)
input_free_device(lid_switch_idev); input_free_device(lid_switch_idev);
} }
static int __devinit xo1_sci_probe(struct platform_device *pdev) static int xo1_sci_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
int r; int r;
...@@ -613,7 +613,7 @@ static int __devinit xo1_sci_probe(struct platform_device *pdev) ...@@ -613,7 +613,7 @@ static int __devinit xo1_sci_probe(struct platform_device *pdev)
return r; return r;
} }
static int __devexit xo1_sci_remove(struct platform_device *pdev) static int xo1_sci_remove(struct platform_device *pdev)
{ {
mfd_cell_disable(pdev); mfd_cell_disable(pdev);
free_irq(sci_irq, pdev); free_irq(sci_irq, pdev);
...@@ -632,7 +632,7 @@ static struct platform_driver xo1_sci_driver = { ...@@ -632,7 +632,7 @@ static struct platform_driver xo1_sci_driver = {
.name = "olpc-xo1-sci-acpi", .name = "olpc-xo1-sci-acpi",
}, },
.probe = xo1_sci_probe, .probe = xo1_sci_probe,
.remove = __devexit_p(xo1_sci_remove), .remove = xo1_sci_remove,
.suspend = xo1_sci_suspend, .suspend = xo1_sci_suspend,
.resume = xo1_sci_resume, .resume = xo1_sci_resume,
}; };
......
arch/x86/platform/scx200/scx200_32.c
View file @ a18e3690
...@@ -35,7 +35,7 @@ static struct pci_device_id scx200_tbl[] = { ...@@ -35,7 +35,7 @@ static struct pci_device_id scx200_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci,scx200_tbl); MODULE_DEVICE_TABLE(pci,scx200_tbl);
static int __devinit scx200_probe(struct pci_dev *, const struct pci_device_id *); static int scx200_probe(struct pci_dev *, const struct pci_device_id *);
static struct pci_driver scx200_pci_driver = { static struct pci_driver scx200_pci_driver = {
.name = "scx200", .name = "scx200",
...@@ -45,7 +45,7 @@ static struct pci_driver scx200_pci_driver = { ...@@ -45,7 +45,7 @@ static struct pci_driver scx200_pci_driver = {
static DEFINE_MUTEX(scx200_gpio_config_lock); static DEFINE_MUTEX(scx200_gpio_config_lock);
static void __devinit scx200_init_shadow(void) static void scx200_init_shadow(void)
{ {
int bank; int bank;
...@@ -54,7 +54,7 @@ static void __devinit scx200_init_shadow(void) ...@@ -54,7 +54,7 @@ static void __devinit scx200_init_shadow(void)
scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank); scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);
} }
static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
unsigned base; unsigned base;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7