iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARCH: drivers remove __dev* attributes.

Browse Source 
This fixes up all of the smaller arches that had __dev* markings for
their platform-specific drivers.

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,
__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: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Myron Stowe <myron.stowe@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Yong Zhang <yong.zhang0@gmail.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Jan Glauber <jang@linux.vnet.ibm.com>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 14:06:37 -08:00
parent f8d6c8d98d
commit b881bc469b
27 changed files with 74 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/perf_event.c
View File

@ -1221,7 +1221,7 @@ static struct of_device_id armpmu_of_device_ids[] = {
{}, {},
}; };
static int __devinit armpmu_device_probe(struct platform_device *pdev) static int armpmu_device_probe(struct platform_device *pdev)
{ {
if (!cpu_pmu) if (!cpu_pmu)
return -ENODEV; return -ENODEV;

2
arch/avr32/lib/delay.c
View File

@ -20,7 +20,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/sysreg.h> #include <asm/sysreg.h>
int __devinit read_current_timer(unsigned long *timer_value) int read_current_timer(unsigned long *timer_value)
{ {
*timer_value = sysreg_read(COUNT); *timer_value = sysreg_read(COUNT);
return 0; return 0;

6
arch/blackfin/mach-common/dpmc.c
View File

@ -129,7 +129,7 @@ static struct notifier_block vreg_cpufreq_notifier_block = {
* bfin_dpmc_probe - * bfin_dpmc_probe -
* *
*/ */
static int __devinit bfin_dpmc_probe(struct platform_device *pdev) static int bfin_dpmc_probe(struct platform_device *pdev)
{ {
if (pdev->dev.platform_data) if (pdev->dev.platform_data)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
@ -143,7 +143,7 @@ static int __devinit bfin_dpmc_probe(struct platform_device *pdev)
/** /**
* bfin_dpmc_remove - * bfin_dpmc_remove -
*/ */
static int __devexit bfin_dpmc_remove(struct platform_device *pdev) static int bfin_dpmc_remove(struct platform_device *pdev)
{ {
pdata = NULL; pdata = NULL;
return cpufreq_unregister_notifier(&vreg_cpufreq_notifier_block, return cpufreq_unregister_notifier(&vreg_cpufreq_notifier_block,
@ -152,7 +152,7 @@ static int __devexit bfin_dpmc_remove(struct platform_device *pdev)
struct platform_driver bfin_dpmc_device_driver = { struct platform_driver bfin_dpmc_device_driver = {
.probe = bfin_dpmc_probe, .probe = bfin_dpmc_probe,
.remove = __devexit_p(bfin_dpmc_remove), .remove = bfin_dpmc_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
} }

2
arch/cris/arch-v32/drivers/pci/bios.c
View File

@ -2,7 +2,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <arch/hwregs/intr_vect.h> #include <arch/hwregs/intr_vect.h>
void __devinit pcibios_fixup_bus(struct pci_bus *b) void pcibios_fixup_bus(struct pci_bus *b)
{ {
} }

2
arch/cris/arch-v32/kernel/smp.c
View File

@ -84,7 +84,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
cpumask_set_cpu(i, &phys_cpu_present_map); cpumask_set_cpu(i, &phys_cpu_present_map);
} }
void __devinit smp_prepare_boot_cpu(void) void smp_prepare_boot_cpu(void)
{ {
/* PGD pointer has moved after per_cpu initialization so /* PGD pointer has moved after per_cpu initialization so
* update the MMU. * update the MMU.

2
arch/frv/kernel/setup.c
View File

@ -852,7 +852,7 @@ void __init setup_arch(char **cmdline_p)
/* /*
* *
*/ */
static int __devinit setup_arch_serial(void) static int setup_arch_serial(void)
{ {
/* register those serial ports that are available */ /* register those serial ports that are available */
#ifndef CONFIG_GDBSTUB_UART0 #ifndef CONFIG_GDBSTUB_UART0

6
arch/frv/mb93090-mb00/pci-vdk.c
View File

@ -268,7 +268,7 @@ static void __init pci_fixup_umc_ide(struct pci_dev *d)
d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO;
} }
static void __devinit pci_fixup_ide_bases(struct pci_dev *d) static void pci_fixup_ide_bases(struct pci_dev *d)
{ {
int i; int i;
@ -287,7 +287,7 @@ static void __devinit pci_fixup_ide_bases(struct pci_dev *d)
} }
} }
static void __devinit pci_fixup_ide_trash(struct pci_dev *d) static void pci_fixup_ide_trash(struct pci_dev *d)
{ {
int i; int i;
@ -300,7 +300,7 @@ static void __devinit pci_fixup_ide_trash(struct pci_dev *d)
d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0; d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0;
} }
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

2
arch/m32r/kernel/smpboot.c
View File

@ -127,7 +127,7 @@ static void unmap_cpu_to_physid(int, int);
/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
/* Boot up APs Routines : BSP */ /* Boot up APs Routines : BSP */
/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
void __devinit smp_prepare_boot_cpu(void) void smp_prepare_boot_cpu(void)
{ {
bsp_phys_id = hard_smp_processor_id(); bsp_phys_id = hard_smp_processor_id();
physid_set(bsp_phys_id, phys_cpu_present_map); physid_set(bsp_phys_id, phys_cpu_present_map);

2
arch/m68k/emu/nfeth.c
View File

@ -39,7 +39,7 @@ enum {
#define MAX_UNIT 8 #define MAX_UNIT 8
/* These identify the driver base version and may not be removed. */ /* These identify the driver base version and may not be removed. */
static const char version[] __devinitconst = static const char version[] =
KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE
" S.Opichal, M.Jurik, P.Stehlik\n" " S.Opichal, M.Jurik, P.Stehlik\n"
KERN_INFO " http://aranym.org/\n"; KERN_INFO " http://aranym.org/\n";

4
arch/m68k/include/asm/parport.h
View File

@ -15,8 +15,8 @@
#define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2) #define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2)
/* no dma, or IRQ autoprobing */ /* no dma, or IRQ autoprobing */
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)
{ {
if (! (MACH_IS_Q40)) if (! (MACH_IS_Q40))
return 0; /* count=0 */ return 0; /* count=0 */

4
arch/m68k/kernel/pcibios.c
View File

@ -87,7 +87,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return 0; return 0;
} }
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
struct pci_dev *dev; struct pci_dev *dev;
@ -97,7 +97,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
} }
} }
char __devinit *pcibios_setup(char *str) char *pcibios_setup(char *str)
{ {
return str; return str;
} }

26
arch/microblaze/pci/pci-common.c
View File

@ -655,9 +655,8 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
* - Some 32 bits platforms such as 4xx can have physical space larger than * - Some 32 bits platforms such as 4xx can have physical space larger than
* 32 bits so we need to use 64 bits values for the parsing * 32 bits so we need to use 64 bits values for the parsing
*/ */
void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, void pci_process_bridge_OF_ranges(struct pci_controller *hose,
struct device_node *dev, struct device_node *dev, int primary)
int primary)
{ {
const u32 *ranges; const u32 *ranges;
int rlen; int rlen;
@ -830,7 +829,7 @@ int pci_proc_domain(struct pci_bus *bus)
/* This header fixup will do the resource fixup for all devices as they are /* This header fixup will do the resource fixup for all devices as they are
* probed, but not for bridge ranges * probed, but not for bridge ranges
*/ */
static void __devinit pcibios_fixup_resources(struct pci_dev *dev) static void pcibios_fixup_resources(struct pci_dev *dev)
{ {
struct pci_controller *hose = pci_bus_to_host(dev->bus); struct pci_controller *hose = pci_bus_to_host(dev->bus);
int i; int i;
@ -871,7 +870,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources);
* things go more smoothly when it gets it right. It should covers cases such * things go more smoothly when it gets it right. It should covers cases such
* as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges * as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges
*/ */
static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus, static int pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
struct resource *res) struct resource *res)
{ {
struct pci_controller *hose = pci_bus_to_host(bus); struct pci_controller *hose = pci_bus_to_host(bus);
@ -933,7 +932,7 @@ static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
} }
/* Fixup resources of a PCI<->PCI bridge */ /* Fixup resources of a PCI<->PCI bridge */
static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) static void pcibios_fixup_bridge(struct pci_bus *bus)
{ {
struct resource *res; struct resource *res;
int i; int i;
@ -970,14 +969,14 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)
} }
} }
void __devinit pcibios_setup_bus_self(struct pci_bus *bus) void pcibios_setup_bus_self(struct pci_bus *bus)
{ {
/* Fix up the bus resources for P2P bridges */ /* Fix up the bus resources for P2P bridges */
if (bus->self != NULL) if (bus->self != NULL)
pcibios_fixup_bridge(bus); pcibios_fixup_bridge(bus);
} }
void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) void pcibios_setup_bus_devices(struct pci_bus *bus)
{ {
struct pci_dev *dev; struct pci_dev *dev;
@ -1002,7 +1001,7 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
} }
} }
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
/* When called from the generic PCI probe, read PCI<->PCI bridge /* When called from the generic PCI probe, read PCI<->PCI bridge
* bases. This is -not- called when generating the PCI tree from * bases. This is -not- called when generating the PCI tree from
@ -1188,7 +1187,7 @@ clear_resource:
pcibios_allocate_bus_resources(b); pcibios_allocate_bus_resources(b);
} }
static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) static inline void alloc_resource(struct pci_dev *dev, int idx)
{ {
struct resource *pr, *r = &dev->resource[idx]; struct resource *pr, *r = &dev->resource[idx];
@ -1351,7 +1350,7 @@ void __init pcibios_resource_survey(void)
* rest of the code later, for now, keep it as-is as our main * rest of the code later, for now, keep it as-is as our main
* resource allocation function doesn't deal with sub-trees yet. * resource allocation function doesn't deal with sub-trees yet.
*/ */
void __devinit pcibios_claim_one_bus(struct pci_bus *bus) void pcibios_claim_one_bus(struct pci_bus *bus)
{ {
struct pci_dev *dev; struct pci_dev *dev;
struct pci_bus *child_bus; struct pci_bus *child_bus;
@ -1410,7 +1409,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return pci_enable_resources(dev, mask); return pci_enable_resources(dev, mask);
} }
static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources) static void pcibios_setup_phb_resources(struct pci_controller *hose,
struct list_head *resources)
{ {
unsigned long io_offset; unsigned long io_offset;
struct resource *res; struct resource *res;
@ -1477,7 +1477,7 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
return of_node_get(hose->dn); return of_node_get(hose->dn);
} }
static void __devinit pcibios_scan_phb(struct pci_controller *hose) static void pcibios_scan_phb(struct pci_controller *hose)
{ {
LIST_HEAD(resources); LIST_HEAD(resources);
struct pci_bus *bus; struct pci_bus *bus;

4
arch/mn10300/kernel/smp.c
View File

@ -905,7 +905,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
* Set up the cpu_online_mask, cpu_callout_map and cpu_callin_map of the boot * Set up the cpu_online_mask, cpu_callout_map and cpu_callin_map of the boot
* processor (CPU 0). * processor (CPU 0).
*/ */
void __devinit smp_prepare_boot_cpu(void) void smp_prepare_boot_cpu(void)
{ {
cpumask_set_cpu(0, &cpu_callout_map); cpumask_set_cpu(0, &cpu_callout_map);
cpumask_set_cpu(0, &cpu_callin_map); cpumask_set_cpu(0, &cpu_callin_map);
@ -930,7 +930,7 @@ void initialize_secondary(void)
* __cpu_up - Set smp_commenced_mask for the nominated CPU * __cpu_up - Set smp_commenced_mask for the nominated CPU
* @cpu: The target CPU. * @cpu: The target CPU.
*/ */
int __devinit __cpu_up(unsigned int cpu, struct task_struct *tidle) int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{ {
int timeout; int timeout;

6
arch/mn10300/unit-asb2305/pci.c
View File

@ -282,7 +282,7 @@ static int __init pci_check_direct(void)
return -ENODEV; return -ENODEV;
} }
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;
@ -302,7 +302,7 @@ static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
return 0; return 0;
} }
static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) static void pcibios_fixup_device_resources(struct pci_dev *dev)
{ {
int limit, i; int limit, i;
@ -325,7 +325,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
* Called after each bus is probed, but before its children * Called after each bus is probed, but before its children
* are examined. * are examined.
*/ */
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
struct pci_dev *dev; struct pci_dev *dev;

2
arch/openrisc/lib/delay.c
View File

@ -22,7 +22,7 @@
#include <asm/timex.h> #include <asm/timex.h>
#include <asm/processor.h> #include <asm/processor.h>
int __devinit read_current_timer(unsigned long *timer_value) int read_current_timer(unsigned long *timer_value)
{ {
*timer_value = mfspr(SPR_TTCR); *timer_value = mfspr(SPR_TTCR);
return 0; return 0;

2
arch/parisc/include/asm/parport.h
View File

@ -8,7 +8,7 @@
#define _ASM_PARPORT_H 1 #define _ASM_PARPORT_H 1
static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
{ {
/* nothing ! */ /* nothing ! */
return 0; return 0;

7
arch/parisc/kernel/hardware.c
View File

@ -38,7 +38,7 @@
* so don't reference this table after starting the init process * so don't reference this table after starting the init process
*/ */
static struct hp_hardware hp_hardware_list[] __devinitdata = { static struct hp_hardware hp_hardware_list[] = {
{HPHW_NPROC,0x01,0x4,0x0,"Indigo (840, 930)"}, {HPHW_NPROC,0x01,0x4,0x0,"Indigo (840, 930)"},
{HPHW_NPROC,0x8,0x4,0x01,"Firefox(825,925)"}, {HPHW_NPROC,0x8,0x4,0x01,"Firefox(825,925)"},
{HPHW_NPROC,0xA,0x4,0x01,"Top Gun (835,834,935,635)"}, {HPHW_NPROC,0xA,0x4,0x01,"Top Gun (835,834,935,635)"},
@ -1230,7 +1230,7 @@ static struct hp_cpu_type_mask {
unsigned short model; unsigned short model;
unsigned short mask; unsigned short mask;
enum cpu_type cpu; enum cpu_type cpu;
} hp_cpu_type_mask_list[] __devinitdata = { } hp_cpu_type_mask_list[] = {
{ 0x0000, 0x0ff0, pcx }, /* 0x0000 - 0x000f */ { 0x0000, 0x0ff0, pcx }, /* 0x0000 - 0x000f */
{ 0x0048, 0x0ff0, pcxl }, /* 0x0040 - 0x004f */ { 0x0048, 0x0ff0, pcxl }, /* 0x0040 - 0x004f */
@ -1327,8 +1327,7 @@ const char * const cpu_name_version[][2] = {
[mako2] = { "PA8900 (Shortfin)", "2.0" } [mako2] = { "PA8900 (Shortfin)", "2.0" }
}; };
const char * __devinit const char *parisc_hardware_description(struct parisc_device_id *id)
parisc_hardware_description(struct parisc_device_id *id)
{ {
struct hp_hardware *listptr; struct hp_hardware *listptr;

7
arch/s390/kernel/smp.c
View File

@ -623,10 +623,9 @@ static struct sclp_cpu_info *smp_get_cpu_info(void)
return info; return info;
} }
static int __devinit smp_add_present_cpu(int cpu); static int smp_add_present_cpu(int cpu);
static int __devinit __smp_rescan_cpus(struct sclp_cpu_info *info, static int __smp_rescan_cpus(struct sclp_cpu_info *info, int sysfs_add)
int sysfs_add)
{ {
struct pcpu *pcpu; struct pcpu *pcpu;
cpumask_t avail; cpumask_t avail;
@ -986,7 +985,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
return notifier_from_errno(err); return notifier_from_errno(err);
} }
static int __devinit smp_add_present_cpu(int cpu) static int smp_add_present_cpu(int cpu)
{ {
struct cpu *c = &pcpu_devices[cpu].cpu; struct cpu *c = &pcpu_devices[cpu].cpu;
struct device *s = &c->dev; struct device *s = &c->dev;

2
arch/s390/pci/pci.c
View File

@ -385,7 +385,7 @@ unsigned int probe_irq_mask(unsigned long val)
} }
EXPORT_SYMBOL_GPL(probe_irq_mask); EXPORT_SYMBOL_GPL(probe_irq_mask);
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
} }

2
arch/score/mm/cache.c
View File

@ -113,7 +113,7 @@ static inline void setup_protection_map(void)
protection_map[15] = PAGE_SHARED; protection_map[15] = PAGE_SHARED;
} }
void __devinit cpu_cache_init(void) void cpu_cache_init(void)
{ {
setup_protection_map(); setup_protection_map();
} }

2
arch/sh/drivers/pci/fixups-dreamcast.c
View File

@ -28,7 +28,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/pci.h> #include <mach/pci.h>
static void __devinit gapspci_fixup_resources(struct pci_dev *dev) static void gapspci_fixup_resources(struct pci_dev *dev)
{ {
struct pci_channel *p = dev->sysdata; struct pci_channel *p = dev->sysdata;

6
arch/sh/drivers/pci/pci.c
View File

@ -32,7 +32,7 @@ static struct pci_channel *hose_head, **hose_tail = &hose_head;
static int pci_initialized; static int pci_initialized;
static void __devinit pcibios_scanbus(struct pci_channel *hose) static void pcibios_scanbus(struct pci_channel *hose)
{ {
static int next_busno; static int next_busno;
static int need_domain_info; static int need_domain_info;
@ -82,7 +82,7 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)
DEFINE_RAW_SPINLOCK(pci_config_lock); DEFINE_RAW_SPINLOCK(pci_config_lock);
static DEFINE_MUTEX(pci_scan_mutex); static DEFINE_MUTEX(pci_scan_mutex);
int __devinit register_pci_controller(struct pci_channel *hose) int register_pci_controller(struct pci_channel *hose)
{ {
int i; int i;
@ -156,7 +156,7 @@ subsys_initcall(pcibios_init);
* Called after each bus is probed, but before its children * Called after each bus is probed, but before its children
* are examined. * are examined.
*/ */
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
} }

2
arch/sh/drivers/pci/pcie-sh7786.c
View File

@ -132,7 +132,7 @@ static struct clk fixed_pciexclkp = {
.rate = 100000000, /* 100 MHz reference clock */ .rate = 100000000, /* 100 MHz reference clock */
}; };
static void __devinit sh7786_pci_fixup(struct pci_dev *dev) static void sh7786_pci_fixup(struct pci_dev *dev)
{ {
/* /*
* Prevent enumeration of root complex resources. * Prevent enumeration of root complex resources.

2
arch/tile/include/asm/pci.h
View File

@ -188,7 +188,7 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
int __init tile_pci_init(void); int __init tile_pci_init(void);
int __init pcibios_init(void); int __init pcibios_init(void);
void __devinit pcibios_fixup_bus(struct pci_bus *bus); void pcibios_fixup_bus(struct pci_bus *bus);
#define pci_domain_nr(bus) (((struct pci_controller *)(bus)->sysdata)->index) #define pci_domain_nr(bus) (((struct pci_controller *)(bus)->sysdata)->index)

23
arch/tile/kernel/pci.c
View File

@ -81,7 +81,7 @@ EXPORT_SYMBOL(pcibios_align_resource);
* controller_id is the controller number, config type is 0 or 1 for * controller_id is the controller number, config type is 0 or 1 for
* config0 or config1 operations. * config0 or config1 operations.
*/ */
static int __devinit tile_pcie_open(int controller_id, int config_type) static int tile_pcie_open(int controller_id, int config_type)
{ {
char filename[32]; char filename[32];
int fd; int fd;
@ -97,8 +97,7 @@ static int __devinit tile_pcie_open(int controller_id, int config_type)
/* /*
* Get the IRQ numbers from the HV and set up the handlers for them. * Get the IRQ numbers from the HV and set up the handlers for them.
*/ */
static int __devinit tile_init_irqs(int controller_id, static int tile_init_irqs(int controller_id, struct pci_controller *controller)
struct pci_controller *controller)
{ {
char filename[32]; char filename[32];
int fd; int fd;
@ -237,7 +236,7 @@ static int tile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
} }
static void __devinit fixup_read_and_payload_sizes(void) static void fixup_read_and_payload_sizes(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */ int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */
@ -379,7 +378,7 @@ subsys_initcall(pcibios_init);
/* /*
* No bus fixups needed. * No bus fixups needed.
*/ */
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
/* Nothing needs to be done. */ /* Nothing needs to be done. */
} }
@ -458,11 +457,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
* specified bus & slot. * specified bus & slot.
*/ */
static int __devinit tile_cfg_read(struct pci_bus *bus, static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset,
unsigned int devfn, int size, u32 *val)
int offset,
int size,
u32 *val)
{ {
struct pci_controller *controller = bus->sysdata; struct pci_controller *controller = bus->sysdata;
int busnum = bus->number & 0xff; int busnum = bus->number & 0xff;
@ -504,11 +500,8 @@ static int __devinit tile_cfg_read(struct pci_bus *bus,
* See tile_cfg_read() for relevant comments. * See tile_cfg_read() for relevant comments.
* Note that "val" is the value to write, not a pointer to that value. * Note that "val" is the value to write, not a pointer to that value.
*/ */
static int __devinit tile_cfg_write(struct pci_bus *bus, static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset,
unsigned int devfn, int size, u32 val)
int offset,
int size,
u32 val)
{ {
struct pci_controller *controller = bus->sysdata; struct pci_controller *controller = bus->sysdata;
int busnum = bus->number & 0xff; int busnum = bus->number & 0xff;

33
arch/tile/kernel/pci_gx.c
View File

@ -58,10 +58,10 @@
#define TRACE_CFG_RD(...) #define TRACE_CFG_RD(...)
#endif #endif
static int __devinitdata pci_probe = 1; static int pci_probe = 1;
/* Information on the PCIe RC ports configuration. */ /* Information on the PCIe RC ports configuration. */
static int __devinitdata pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; static int pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
/* /*
* On some platforms with one or more Gx endpoint ports, we need to * On some platforms with one or more Gx endpoint ports, we need to
@ -72,7 +72,7 @@ static int __devinitdata pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
* the delay in seconds. If the delay is not provided, the value * the delay in seconds. If the delay is not provided, the value
* will be DEFAULT_RC_DELAY. * will be DEFAULT_RC_DELAY.
*/ */
static int __devinitdata rc_delay[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; static int rc_delay[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
/* Default number of seconds that the PCIe RC port probe can be delayed. */ /* Default number of seconds that the PCIe RC port probe can be delayed. */
#define DEFAULT_RC_DELAY 10 #define DEFAULT_RC_DELAY 10
@ -137,7 +137,7 @@ static int tile_irq_cpu(int irq)
/* /*
* Open a file descriptor to the TRIO shim. * Open a file descriptor to the TRIO shim.
*/ */
static int __devinit tile_pcie_open(int trio_index) static int tile_pcie_open(int trio_index)
{ {
gxio_trio_context_t *context = &trio_contexts[trio_index]; gxio_trio_context_t *context = &trio_contexts[trio_index];
int ret; int ret;
@ -265,7 +265,7 @@ trio_handle_level_irq(unsigned int irq, struct irq_desc *desc)
* Create kernel irqs and set up the handlers for the legacy interrupts. * Create kernel irqs and set up the handlers for the legacy interrupts.
* Also some minimum initialization for the MSI support. * Also some minimum initialization for the MSI support.
*/ */
static int __devinit tile_init_irqs(struct pci_controller *controller) static int tile_init_irqs(struct pci_controller *controller)
{ {
int i; int i;
int j; int j;
@ -459,8 +459,7 @@ static int tile_map_irq(const struct pci_dev *dev, u8 device, u8 pin)
} }
static void __devinit fixup_read_and_payload_sizes(struct pci_controller * static void fixup_read_and_payload_sizes(struct pci_controller *controller)
controller)
{ {
gxio_trio_context_t *trio_context = controller->trio; gxio_trio_context_t *trio_context = controller->trio;
struct pci_bus *root_bus = controller->root_bus; struct pci_bus *root_bus = controller->root_bus;
@ -541,7 +540,7 @@ static void __devinit fixup_read_and_payload_sizes(struct pci_controller *
} }
} }
static int __devinit setup_pcie_rc_delay(char *str) static int setup_pcie_rc_delay(char *str)
{ {
unsigned long delay = 0; unsigned long delay = 0;
unsigned long trio_index; unsigned long trio_index;
@ -1016,7 +1015,7 @@ alloc_mem_map_failed:
subsys_initcall(pcibios_init); subsys_initcall(pcibios_init);
/* Note: to be deleted after Linux 3.6 merge. */ /* Note: to be deleted after Linux 3.6 merge. */
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
} }
@ -1024,7 +1023,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
* This can be called from the generic PCI layer, but doesn't need to * This can be called from the generic PCI layer, but doesn't need to
* do anything. * do anything.
*/ */
char __devinit *pcibios_setup(char *str) char *pcibios_setup(char *str)
{ {
if (!strcmp(str, "off")) { if (!strcmp(str, "off")) {
pci_probe = 0; pci_probe = 0;
@ -1143,11 +1142,8 @@ EXPORT_SYMBOL(pci_iounmap);
* specified bus & device. * specified bus & device.
*/ */
static int __devinit tile_cfg_read(struct pci_bus *bus, static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset,
unsigned int devfn, int size, u32 *val)
int offset,
int size,
u32 *val)
{ {
struct pci_controller *controller = bus->sysdata; struct pci_controller *controller = bus->sysdata;
gxio_trio_context_t *trio_context = controller->trio; gxio_trio_context_t *trio_context = controller->trio;
@ -1271,11 +1267,8 @@ invalid_device:
* See tile_cfg_read() for relevent comments. * See tile_cfg_read() for relevent comments.
* Note that "val" is the value to write, not a pointer to that value. * Note that "val" is the value to write, not a pointer to that value.
*/ */
static int __devinit tile_cfg_write(struct pci_bus *bus, static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset,
unsigned int devfn, int size, u32 val)
int offset,
int size,
u32 val)
{ {
struct pci_controller *controller = bus->sysdata; struct pci_controller *controller = bus->sysdata;
gxio_trio_context_t *trio_context = controller->trio; gxio_trio_context_t *trio_context = controller->trio;

2
arch/unicore32/kernel/pci.c
View File

@ -167,7 +167,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev)
* pcibios_fixup_bus - Called after each bus is probed, * pcibios_fixup_bus - Called after each bus is probed,
* but before its children are examined. * but before its children are examined.
*/ */
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void pcibios_fixup_bus(struct pci_bus *bus)
{ {
struct pci_dev *dev; struct pci_dev *dev;
u16 features = PCI_COMMAND_SERR u16 features = PCI_COMMAND_SERR