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

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

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

arch/x86/include/asm/parport.h

+2 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PARPORT_H

#define _ASM_X86_PARPORT_H



static int __devinit 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_isa_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/x86/include/asm/pci_x86.h

+3 −4
Original line number Diff line number Diff line
@@ -140,11 +140,10 @@ struct pci_mmcfg_region { 


extern int __init pci_mmcfg_arch_init(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 int __devinit pci_mmconfig_insert(struct device *dev,

					 u16 seg, u8 start,

					 u8 end, phys_addr_t addr);

extern int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,

			       phys_addr_t addr);

extern int pci_mmconfig_delete(u16 seg, u8 start, u8 end);

extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+3 −3
Original line number Diff line number Diff line
@@ -2500,7 +2500,7 @@ static bool pcidrv_registered; 
/*

 * 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_box *box;
@@ -2571,7 +2571,7 @@ static void uncore_pci_remove(struct pci_dev *pdev) 
	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)

{

	struct intel_uncore_type *type;

arch/x86/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ rootfs_initcall(pci_iommu_init); 
#ifdef CONFIG_PCI

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

		dev_info(&dev->dev, "disabling DAC on VIA PCI bridge\n");

arch/x86/kernel/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


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

	u16 word;
@@ -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)

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

	unsigned int devfn;