Skip to content

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

SPARC: 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: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a18e3690
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 100 deletions
arch/sparc/include/asm/parport.h
View file @ 7c9503b8
...@@ -103,7 +103,7 @@ static inline unsigned int get_dma_residue(unsigned int dmanr) ...@@ -103,7 +103,7 @@ static inline unsigned int get_dma_residue(unsigned int dmanr)
return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info); return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
} }
static int __devinit ecpp_probe(struct platform_device *op) static int ecpp_probe(struct platform_device *op)
{ {
unsigned long base = op->resource[0].start; unsigned long base = op->resource[0].start;
unsigned long config = op->resource[1].start; unsigned long config = op->resource[1].start;
...@@ -192,7 +192,7 @@ static int __devinit ecpp_probe(struct platform_device *op) ...@@ -192,7 +192,7 @@ static int __devinit ecpp_probe(struct platform_device *op)
return err; return err;
} }
static int __devexit ecpp_remove(struct platform_device *op) static int ecpp_remove(struct platform_device *op)
{ {
struct parport *p = dev_get_drvdata(&op->dev); struct parport *p = dev_get_drvdata(&op->dev);
int slot = p->dma; int slot = p->dma;
...@@ -242,7 +242,7 @@ static struct platform_driver ecpp_driver = { ...@@ -242,7 +242,7 @@ static struct platform_driver ecpp_driver = {
.of_match_table = ecpp_match, .of_match_table = ecpp_match,
}, },
.probe = ecpp_probe, .probe = ecpp_probe,
.remove = __devexit_p(ecpp_remove), .remove = ecpp_remove,
}; };
static int parport_pc_find_nonpci_ports(int autoirq, int autodma) static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
......
arch/sparc/include/asm/timer_64.h
View file @ 7c9503b8
...@@ -24,7 +24,7 @@ struct sparc64_tick_ops { ...@@ -24,7 +24,7 @@ struct sparc64_tick_ops {
extern struct sparc64_tick_ops *tick_ops; extern struct sparc64_tick_ops *tick_ops;
extern unsigned long sparc64_get_clock_tick(unsigned int cpu); extern unsigned long sparc64_get_clock_tick(unsigned int cpu);
extern void __devinit setup_sparc64_timer(void); extern void setup_sparc64_timer(void);
extern void __init time_init(void); extern void __init time_init(void);
#endif /* _SPARC64_TIMER_H */ #endif /* _SPARC64_TIMER_H */
arch/sparc/kernel/apc.c
View file @ 7c9503b8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define APC_DEVNAME "apc" #define APC_DEVNAME "apc"
static u8 __iomem *regs; static u8 __iomem *regs;
static int apc_no_idle __devinitdata = 0; static int apc_no_idle = 0;
#define apc_readb(offs) (sbus_readb(regs+offs)) #define apc_readb(offs) (sbus_readb(regs+offs))
#define apc_writeb(val, offs) (sbus_writeb(val, regs+offs)) #define apc_writeb(val, offs) (sbus_writeb(val, regs+offs))
...@@ -138,7 +138,7 @@ static const struct file_operations apc_fops = { ...@@ -138,7 +138,7 @@ static const struct file_operations apc_fops = {
static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops }; static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };
static int __devinit apc_probe(struct platform_device *op) static int apc_probe(struct platform_device *op)
{ {
int err; int err;
......
arch/sparc/kernel/auxio_64.c
View file @ 7c9503b8
...@@ -102,7 +102,7 @@ static const struct of_device_id auxio_match[] = { ...@@ -102,7 +102,7 @@ static const struct of_device_id auxio_match[] = {
MODULE_DEVICE_TABLE(of, auxio_match); MODULE_DEVICE_TABLE(of, auxio_match);
static int __devinit auxio_probe(struct platform_device *dev) static int auxio_probe(struct platform_device *dev)
{ {
struct device_node *dp = dev->dev.of_node; struct device_node *dp = dev->dev.of_node;
unsigned long size; unsigned long size;
......
arch/sparc/kernel/central.c
View file @ 7c9503b8
...@@ -33,7 +33,7 @@ struct fhc { ...@@ -33,7 +33,7 @@ struct fhc {
struct platform_device leds_pdev; struct platform_device leds_pdev;
}; };
static int __devinit clock_board_calc_nslots(struct clock_board *p) static int clock_board_calc_nslots(struct clock_board *p)
{ {
u8 reg = upa_readb(p->clock_regs + CLOCK_STAT1) & 0xc0; u8 reg = upa_readb(p->clock_regs + CLOCK_STAT1) & 0xc0;
...@@ -60,7 +60,7 @@ static int __devinit clock_board_calc_nslots(struct clock_board *p) ...@@ -60,7 +60,7 @@ static int __devinit clock_board_calc_nslots(struct clock_board *p)
} }
} }
static int __devinit clock_board_probe(struct platform_device *op) static int clock_board_probe(struct platform_device *op)
{ {
struct clock_board *p = kzalloc(sizeof(*p), GFP_KERNEL); struct clock_board *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM; int err = -ENOMEM;
...@@ -157,7 +157,7 @@ static struct platform_driver clock_board_driver = { ...@@ -157,7 +157,7 @@ static struct platform_driver clock_board_driver = {
}, },
}; };
static int __devinit fhc_probe(struct platform_device *op) static int fhc_probe(struct platform_device *op)
{ {
struct fhc *p = kzalloc(sizeof(*p), GFP_KERNEL); struct fhc *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM; int err = -ENOMEM;
......
arch/sparc/kernel/chmc.c
View file @ 7c9503b8
...@@ -336,7 +336,7 @@ static int jbusmc_print_dimm(int syndrome_code, ...@@ -336,7 +336,7 @@ static int jbusmc_print_dimm(int syndrome_code,
return 0; return 0;
} }
static u64 __devinit jbusmc_dimm_group_size(u64 base, static u64 jbusmc_dimm_group_size(u64 base,
const struct linux_prom64_registers *mem_regs, const struct linux_prom64_registers *mem_regs,
int num_mem_regs) int num_mem_regs)
{ {
...@@ -363,7 +363,7 @@ static u64 __devinit jbusmc_dimm_group_size(u64 base, ...@@ -363,7 +363,7 @@ static u64 __devinit jbusmc_dimm_group_size(u64 base,
return max_seen - base; return max_seen - base;
} }
static void __devinit jbusmc_construct_one_dimm_group(struct jbusmc *p, static void jbusmc_construct_one_dimm_group(struct jbusmc *p,
unsigned long index, unsigned long index,
const struct linux_prom64_registers *mem_regs, const struct linux_prom64_registers *mem_regs,
int num_mem_regs) int num_mem_regs)
...@@ -378,7 +378,7 @@ static void __devinit jbusmc_construct_one_dimm_group(struct jbusmc *p, ...@@ -378,7 +378,7 @@ static void __devinit jbusmc_construct_one_dimm_group(struct jbusmc *p,
dp->size = jbusmc_dimm_group_size(dp->base_addr, mem_regs, num_mem_regs); dp->size = jbusmc_dimm_group_size(dp->base_addr, mem_regs, num_mem_regs);
} }
static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p, static void jbusmc_construct_dimm_groups(struct jbusmc *p,
const struct linux_prom64_registers *mem_regs, const struct linux_prom64_registers *mem_regs,
int num_mem_regs) int num_mem_regs)
{ {
...@@ -392,7 +392,7 @@ static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p, ...@@ -392,7 +392,7 @@ static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p,
} }
} }
static int __devinit jbusmc_probe(struct platform_device *op) static int jbusmc_probe(struct platform_device *op)
{ {
const struct linux_prom64_registers *mem_regs; const struct linux_prom64_registers *mem_regs;
struct device_node *mem_node; struct device_node *mem_node;
...@@ -689,7 +689,7 @@ static void chmc_fetch_decode_regs(struct chmc *p) ...@@ -689,7 +689,7 @@ static void chmc_fetch_decode_regs(struct chmc *p)
chmc_read_mcreg(p, CHMCTRL_DECODE4)); chmc_read_mcreg(p, CHMCTRL_DECODE4));
} }
static int __devinit chmc_probe(struct platform_device *op) static int chmc_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
unsigned long ver; unsigned long ver;
...@@ -763,7 +763,7 @@ static int __devinit chmc_probe(struct platform_device *op) ...@@ -763,7 +763,7 @@ static int __devinit chmc_probe(struct platform_device *op)
goto out; goto out;
} }
static int __devinit us3mc_probe(struct platform_device *op) static int us3mc_probe(struct platform_device *op)
{ {
if (mc_type == MC_TYPE_SAFARI) if (mc_type == MC_TYPE_SAFARI)
return chmc_probe(op); return chmc_probe(op);
...@@ -772,21 +772,21 @@ static int __devinit us3mc_probe(struct platform_device *op) ...@@ -772,21 +772,21 @@ static int __devinit us3mc_probe(struct platform_device *op)
return -ENODEV; return -ENODEV;
} }
static void __devexit chmc_destroy(struct platform_device *op, struct chmc *p) static void chmc_destroy(struct platform_device *op, struct chmc *p)
{ {
list_del(&p->list); list_del(&p->list);
of_iounmap(&op->resource[0], p->regs, 0x48); of_iounmap(&op->resource[0], p->regs, 0x48);
kfree(p); kfree(p);
} }
static void __devexit jbusmc_destroy(struct platform_device *op, struct jbusmc *p) static void jbusmc_destroy(struct platform_device *op, struct jbusmc *p)
{ {
mc_list_del(&p->list); mc_list_del(&p->list);
of_iounmap(&op->resource[0], p->regs, JBUSMC_REGS_SIZE); of_iounmap(&op->resource[0], p->regs, JBUSMC_REGS_SIZE);
kfree(p); kfree(p);
} }
static int __devexit us3mc_remove(struct platform_device *op) static int us3mc_remove(struct platform_device *op)
{ {
void *p = dev_get_drvdata(&op->dev); void *p = dev_get_drvdata(&op->dev);
...@@ -814,7 +814,7 @@ static struct platform_driver us3mc_driver = { ...@@ -814,7 +814,7 @@ static struct platform_driver us3mc_driver = {
.of_match_table = us3mc_match, .of_match_table = us3mc_match,
}, },
.probe = us3mc_probe, .probe = us3mc_probe,
.remove = __devexit_p(us3mc_remove), .remove = us3mc_remove,
}; };
static inline bool us3mc_platform(void) static inline bool us3mc_platform(void)
......
arch/sparc/kernel/ds.c
View file @ 7c9503b8
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define DRV_MODULE_VERSION "1.0" #define DRV_MODULE_VERSION "1.0"
#define DRV_MODULE_RELDATE "Jul 11, 2007" #define DRV_MODULE_RELDATE "Jul 11, 2007"
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
MODULE_DESCRIPTION("Sun LDOM domain services driver"); MODULE_DESCRIPTION("Sun LDOM domain services driver");
...@@ -1146,8 +1146,7 @@ static void ds_event(void *arg, int event) ...@@ -1146,8 +1146,7 @@ static void ds_event(void *arg, int event)
spin_unlock_irqrestore(&ds_lock, flags); spin_unlock_irqrestore(&ds_lock, flags);
} }
static int __devinit ds_probe(struct vio_dev *vdev, static int ds_probe(struct vio_dev *vdev, const struct vio_device_id *id)
const struct vio_device_id *id)
{ {
static int ds_version_printed; static int ds_version_printed;
struct ldc_channel_config ds_cfg = { struct ldc_channel_config ds_cfg = {
......
arch/sparc/kernel/ldc.c
View file @ 7c9503b8
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define DRV_MODULE_VERSION "1.1" #define DRV_MODULE_VERSION "1.1"
#define DRV_MODULE_RELDATE "July 22, 2008" #define DRV_MODULE_RELDATE "July 22, 2008"
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
#define LDC_PACKET_SIZE 64 #define LDC_PACKET_SIZE 64
......
arch/sparc/kernel/leon_pci.c
View file @ 7c9503b8
...@@ -43,7 +43,7 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info) ...@@ -43,7 +43,7 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
} }
} }
void __devinit pcibios_fixup_bus(struct pci_bus *pbus) void pcibios_fixup_bus(struct pci_bus *pbus)
{ {
struct pci_dev *dev; struct pci_dev *dev;
int i, has_io, has_mem; int i, has_io, has_mem;
......
arch/sparc/kernel/leon_pci_grpci2.c
View file @ 7c9503b8
...@@ -668,7 +668,7 @@ static irqreturn_t grpci2_err_interrupt(int irq, void *arg) ...@@ -668,7 +668,7 @@ static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit grpci2_of_probe(struct platform_device *ofdev) static int grpci2_of_probe(struct platform_device *ofdev)
{ {
struct grpci2_regs *regs; struct grpci2_regs *regs;
struct grpci2_priv *priv; struct grpci2_priv *priv;
......
arch/sparc/kernel/pci.c
View file @ 7c9503b8
...@@ -356,7 +356,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, ...@@ -356,7 +356,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
return dev; return dev;
} }
static void __devinit apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p) static void apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p)
{ {
u32 idx, first, last; u32 idx, first, last;
...@@ -378,8 +378,7 @@ static void __devinit apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p) ...@@ -378,8 +378,7 @@ static void __devinit apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p)
/* Cook up fake bus resources for SUNW,simba PCI bridges which lack /* Cook up fake bus resources for SUNW,simba PCI bridges which lack
* a proper 'ranges' property. * a proper 'ranges' property.
*/ */
static void __devinit apb_fake_ranges(struct pci_dev *dev, static void apb_fake_ranges(struct pci_dev *dev, struct pci_bus *bus,
struct pci_bus *bus,
struct pci_pbm_info *pbm) struct pci_pbm_info *pbm)
{ {
struct pci_bus_region region; struct pci_bus_region region;
...@@ -404,15 +403,13 @@ static void __devinit apb_fake_ranges(struct pci_dev *dev, ...@@ -404,15 +403,13 @@ static void __devinit apb_fake_ranges(struct pci_dev *dev,
pcibios_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
} }
static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, static void pci_of_scan_bus(struct pci_pbm_info *pbm, struct device_node *node,
struct device_node *node,
struct pci_bus *bus); struct pci_bus *bus);
#define GET_64BIT(prop, i) ((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1]) #define GET_64BIT(prop, i) ((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1])
static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm, static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
struct device_node *node, struct device_node *node, struct pci_dev *dev)
struct pci_dev *dev)
{ {
struct pci_bus *bus; struct pci_bus *bus;
const u32 *busrange, *ranges; const u32 *busrange, *ranges;
...@@ -503,8 +500,7 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm, ...@@ -503,8 +500,7 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
pci_of_scan_bus(pbm, node, bus); pci_of_scan_bus(pbm, node, bus);
} }
static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, static void pci_of_scan_bus(struct pci_pbm_info *pbm, struct device_node *node,
struct device_node *node,
struct pci_bus *bus) struct pci_bus *bus)
{ {
struct device_node *child; struct device_node *child;
...@@ -564,7 +560,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char * ...@@ -564,7 +560,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char *
static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_pciobppath_attr, NULL); static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_pciobppath_attr, NULL);
static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus) static void pci_bus_register_of_sysfs(struct pci_bus *bus)
{ {
struct pci_dev *dev; struct pci_dev *dev;
struct pci_bus *child_bus; struct pci_bus *child_bus;
...@@ -585,7 +581,7 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus) ...@@ -585,7 +581,7 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
pci_bus_register_of_sysfs(child_bus); pci_bus_register_of_sysfs(child_bus);
} }
struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm, struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
struct device *parent) struct device *parent)
{ {
LIST_HEAD(resources); LIST_HEAD(resources);
...@@ -618,7 +614,7 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm, ...@@ -618,7 +614,7 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
return bus; return bus;
} }
void __devinit pcibios_fixup_bus(struct pci_bus *pbus) void pcibios_fixup_bus(struct pci_bus *pbus)
{ {
} }
...@@ -949,8 +945,7 @@ static int __init pcibios_init(void) ...@@ -949,8 +945,7 @@ static int __init pcibios_init(void)
subsys_initcall(pcibios_init); subsys_initcall(pcibios_init);
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
static void __devinit pci_bus_slot_names(struct device_node *node, static void pci_bus_slot_names(struct device_node *node, struct pci_bus *bus)
struct pci_bus *bus)
{ {
const struct pci_slot_names { const struct pci_slot_names {
u32 slot_mask; u32 slot_mask;
......
arch/sparc/kernel/pci_fire.c
View file @ 7c9503b8
...@@ -408,7 +408,7 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm) ...@@ -408,7 +408,7 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm)
upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB); upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB);
} }
static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm, static int pci_fire_pbm_init(struct pci_pbm_info *pbm,
struct platform_device *op, u32 portid) struct platform_device *op, u32 portid)
{ {
const struct linux_prom64_registers *regs; const struct linux_prom64_registers *regs;
...@@ -454,7 +454,7 @@ static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm, ...@@ -454,7 +454,7 @@ static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,
return 0; return 0;
} }
static int __devinit fire_probe(struct platform_device *op) static int fire_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct pci_pbm_info *pbm; struct pci_pbm_info *pbm;
......
arch/sparc/kernel/pci_psycho.c
View file @ 7c9503b8
...@@ -366,8 +366,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) ...@@ -366,8 +366,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
pci_config_write8(addr, 64); pci_config_write8(addr, 64);
} }
static void __devinit psycho_scan_bus(struct pci_pbm_info *pbm, static void psycho_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
struct device *parent)
{ {
pbm_config_busmastering(pbm); pbm_config_busmastering(pbm);
pbm->is_66mhz_capable = 0; pbm->is_66mhz_capable = 0;
...@@ -483,7 +482,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm, ...@@ -483,7 +482,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,
#define PSYCHO_MEMSPACE_B 0x180000000UL #define PSYCHO_MEMSPACE_B 0x180000000UL
#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL #define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL
static void __devinit psycho_pbm_init(struct pci_pbm_info *pbm, static void psycho_pbm_init(struct pci_pbm_info *pbm,
struct platform_device *op, int is_pbm_a) struct platform_device *op, int is_pbm_a)
{ {
psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO); psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO);
...@@ -491,7 +490,7 @@ static void __devinit psycho_pbm_init(struct pci_pbm_info *pbm, ...@@ -491,7 +490,7 @@ static void __devinit psycho_pbm_init(struct pci_pbm_info *pbm,
psycho_scan_bus(pbm, &op->dev); psycho_scan_bus(pbm, &op->dev);
} }
static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid) static struct pci_pbm_info *psycho_find_sibling(u32 upa_portid)
{ {
struct pci_pbm_info *pbm; struct pci_pbm_info *pbm;
...@@ -504,7 +503,7 @@ static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid) ...@@ -504,7 +503,7 @@ static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid)
#define PSYCHO_CONFIGSPACE 0x001000000UL #define PSYCHO_CONFIGSPACE 0x001000000UL
static int __devinit psycho_probe(struct platform_device *op) static int psycho_probe(struct platform_device *op)
{ {
const struct linux_prom64_registers *pr_regs; const struct linux_prom64_registers *pr_regs;
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
......
arch/sparc/kernel/pci_sabre.c
View file @ 7c9503b8
...@@ -403,8 +403,7 @@ static void apb_init(struct pci_bus *sabre_bus) ...@@ -403,8 +403,7 @@ static void apb_init(struct pci_bus *sabre_bus)
} }
} }
static void __devinit sabre_scan_bus(struct pci_pbm_info *pbm, static void sabre_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
struct device *parent)
{ {
static int once; static int once;
...@@ -443,8 +442,7 @@ static void __devinit sabre_scan_bus(struct pci_pbm_info *pbm, ...@@ -443,8 +442,7 @@ static void __devinit sabre_scan_bus(struct pci_pbm_info *pbm,
sabre_register_error_handlers(pbm); sabre_register_error_handlers(pbm);
} }
static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm, static void sabre_pbm_init(struct pci_pbm_info *pbm, struct platform_device *op)
struct platform_device *op)
{ {
psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE); psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);
pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR; pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR;
...@@ -454,7 +452,7 @@ static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm, ...@@ -454,7 +452,7 @@ static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm,
} }
static const struct of_device_id sabre_match[]; static const struct of_device_id sabre_match[];
static int __devinit sabre_probe(struct platform_device *op) static int sabre_probe(struct platform_device *op)
{ {
const struct of_device_id *match; const struct of_device_id *match;
const struct linux_prom64_registers *pr_regs; const struct linux_prom64_registers *pr_regs;
......
arch/sparc/kernel/pci_schizo.c
View file @ 7c9503b8
...@@ -1064,8 +1064,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) ...@@ -1064,8 +1064,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
pci_config_write8(addr, 64); pci_config_write8(addr, 64);
} }
static void __devinit schizo_scan_bus(struct pci_pbm_info *pbm, static void schizo_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
struct device *parent)
{ {
pbm_config_busmastering(pbm); pbm_config_busmastering(pbm);
pbm->is_66mhz_capable = pbm->is_66mhz_capable =
...@@ -1307,9 +1306,8 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm) ...@@ -1307,9 +1306,8 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
} }
} }
static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm, static int schizo_pbm_init(struct pci_pbm_info *pbm, struct platform_device *op,
struct platform_device *op, u32 portid, u32 portid, int chip_type)
int chip_type)
{ {
const struct linux_prom64_registers *regs; const struct linux_prom64_registers *regs;
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
...@@ -1400,8 +1398,7 @@ static inline int portid_compare(u32 x, u32 y, int chip_type) ...@@ -1400,8 +1398,7 @@ static inline int portid_compare(u32 x, u32 y, int chip_type)
return (x == y); return (x == y);
} }
static struct pci_pbm_info * __devinit schizo_find_sibling(u32 portid, static struct pci_pbm_info *schizo_find_sibling(u32 portid, int chip_type)
int chip_type)
{ {
struct pci_pbm_info *pbm; struct pci_pbm_info *pbm;
...@@ -1412,7 +1409,7 @@ static struct pci_pbm_info * __devinit schizo_find_sibling(u32 portid, ...@@ -1412,7 +1409,7 @@ static struct pci_pbm_info * __devinit schizo_find_sibling(u32 portid,
return NULL; return NULL;
} }
static int __devinit __schizo_init(struct platform_device *op, unsigned long chip_type) static int __schizo_init(struct platform_device *op, unsigned long chip_type)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct pci_pbm_info *pbm; struct pci_pbm_info *pbm;
...@@ -1460,7 +1457,7 @@ static int __devinit __schizo_init(struct platform_device *op, unsigned long chi ...@@ -1460,7 +1457,7 @@ static int __devinit __schizo_init(struct platform_device *op, unsigned long chi
} }
static const struct of_device_id schizo_match[]; static const struct of_device_id schizo_match[];
static int __devinit schizo_probe(struct platform_device *op) static int schizo_probe(struct platform_device *op)
{ {
const struct of_device_id *match; const struct of_device_id *match;
......
arch/sparc/kernel/pci_sun4v.c
View file @ 7c9503b8
...@@ -536,8 +536,7 @@ static struct dma_map_ops sun4v_dma_ops = { ...@@ -536,8 +536,7 @@ static struct dma_map_ops sun4v_dma_ops = {
.unmap_sg = dma_4v_unmap_sg, .unmap_sg = dma_4v_unmap_sg,
}; };
static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm, static void pci_sun4v_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
struct device *parent)
{ {
struct property *prop; struct property *prop;
struct device_node *dp; struct device_node *dp;
...@@ -550,7 +549,7 @@ static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm, ...@@ -550,7 +549,7 @@ static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,
/* XXX register error interrupt handlers XXX */ /* XXX register error interrupt handlers XXX */
} }
static unsigned long __devinit probe_existing_entries(struct pci_pbm_info *pbm, static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
struct iommu *iommu) struct iommu *iommu)
{ {
struct iommu_arena *arena = &iommu->arena; struct iommu_arena *arena = &iommu->arena;
...@@ -578,7 +577,7 @@ static unsigned long __devinit probe_existing_entries(struct pci_pbm_info *pbm, ...@@ -578,7 +577,7 @@ static unsigned long __devinit probe_existing_entries(struct pci_pbm_info *pbm,
return cnt; return cnt;
} }
static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm) static int pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
{ {
static const u32 vdma_default[] = { 0x80000000, 0x80000000 }; static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
struct iommu *iommu = pbm->iommu; struct iommu *iommu = pbm->iommu;
...@@ -879,7 +878,7 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm) ...@@ -879,7 +878,7 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm)
} }
#endif /* !(CONFIG_PCI_MSI) */ #endif /* !(CONFIG_PCI_MSI) */
static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm, static int pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
struct platform_device *op, u32 devhandle) struct platform_device *op, u32 devhandle)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
...@@ -919,7 +918,7 @@ static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm, ...@@ -919,7 +918,7 @@ static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
return 0; return 0;
} }
static int __devinit pci_sun4v_probe(struct platform_device *op) static int pci_sun4v_probe(struct platform_device *op)
{ {
const struct linux_prom64_registers *regs; const struct linux_prom64_registers *regs;
static int hvapi_negotiated = 0; static int hvapi_negotiated = 0;
......
arch/sparc/kernel/pcic.c
View file @ 7c9503b8
...@@ -439,8 +439,7 @@ int pcic_present(void) ...@@ -439,8 +439,7 @@ int pcic_present(void)
return pcic0_up; return pcic0_up;
} }
static int __devinit pdev_to_pnode(struct linux_pbm_info *pbm, static int pdev_to_pnode(struct linux_pbm_info *pbm, struct pci_dev *pdev)
struct pci_dev *pdev)
{ {
struct linux_prom_pci_registers regs[PROMREG_MAX]; struct linux_prom_pci_registers regs[PROMREG_MAX];
int err; int err;
...@@ -595,7 +594,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node) ...@@ -595,7 +594,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
/* /*
* Normally called from {do_}pci_scan_bus... * Normally called from {do_}pci_scan_bus...
*/ */
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;
int i, has_io, has_mem; int i, has_io, has_mem;
......
arch/sparc/kernel/pmc.c
View file @ 7c9503b8
...@@ -52,7 +52,7 @@ static void pmc_swift_idle(void) ...@@ -52,7 +52,7 @@ static void pmc_swift_idle(void)
#endif #endif
} }
static int __devinit pmc_probe(struct platform_device *op) static int pmc_probe(struct platform_device *op)
{ {
regs = of_ioremap(&op->resource[0], 0, regs = of_ioremap(&op->resource[0], 0,
resource_size(&op->resource[0]), PMC_OBPNAME); resource_size(&op->resource[0]), PMC_OBPNAME);
......
arch/sparc/kernel/power.c
View file @ 7c9503b8
...@@ -23,7 +23,7 @@ static irqreturn_t power_handler(int irq, void *dev_id) ...@@ -23,7 +23,7 @@ static irqreturn_t power_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit has_button_interrupt(unsigned int irq, struct device_node *dp) static int has_button_interrupt(unsigned int irq, struct device_node *dp)
{ {
if (irq == 0xffffffff) if (irq == 0xffffffff)
return 0; return 0;
...@@ -33,7 +33,7 @@ static int __devinit has_button_interrupt(unsigned int irq, struct device_node * ...@@ -33,7 +33,7 @@ static int __devinit has_button_interrupt(unsigned int irq, struct device_node *
return 1; return 1;
} }
static int __devinit power_probe(struct platform_device *op) static int power_probe(struct platform_device *op)
{ {
struct resource *res = &op->resource[0]; struct resource *res = &op->resource[0];
unsigned int irq = op->archdata.irqs[0]; unsigned int irq = op->archdata.irqs[0];
......
arch/sparc/kernel/smp_64.c
View file @ 7c9503b8
...@@ -1180,7 +1180,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) ...@@ -1180,7 +1180,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
{ {
} }
void __devinit smp_prepare_boot_cpu(void) void smp_prepare_boot_cpu(void)
{ {
} }
...@@ -1194,7 +1194,7 @@ void __init smp_setup_processor_id(void) ...@@ -1194,7 +1194,7 @@ void __init smp_setup_processor_id(void)
xcall_deliver_impl = hypervisor_xcall_deliver; xcall_deliver_impl = hypervisor_xcall_deliver;
} }
void __devinit smp_fill_in_sib_core_maps(void) void smp_fill_in_sib_core_maps(void)
{ {
unsigned int i; unsigned int i;
......
arch/sparc/kernel/time_32.c
View file @ 7c9503b8
...@@ -278,7 +278,7 @@ static struct platform_device m48t59_rtc = { ...@@ -278,7 +278,7 @@ static struct platform_device m48t59_rtc = {
}, },
}; };
static int __devinit clock_probe(struct platform_device *op) static int clock_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
const char *model = of_get_property(dp, "model", NULL); const char *model = of_get_property(dp, "model", NULL);
......
arch/sparc/kernel/time_64.c
View file @ 7c9503b8
...@@ -419,7 +419,7 @@ static struct platform_device rtc_cmos_device = { ...@@ -419,7 +419,7 @@ static struct platform_device rtc_cmos_device = {
.num_resources = 1, .num_resources = 1,
}; };
static int __devinit rtc_probe(struct platform_device *op) static int rtc_probe(struct platform_device *op)
{ {
struct resource *r; struct resource *r;
...@@ -477,7 +477,7 @@ static struct platform_device rtc_bq4802_device = { ...@@ -477,7 +477,7 @@ static struct platform_device rtc_bq4802_device = {
.num_resources = 1, .num_resources = 1,
}; };
static int __devinit bq4802_probe(struct platform_device *op) static int bq4802_probe(struct platform_device *op)
{ {
printk(KERN_INFO "%s: BQ4802 regs at 0x%llx\n", printk(KERN_INFO "%s: BQ4802 regs at 0x%llx\n",
...@@ -534,7 +534,7 @@ static struct platform_device m48t59_rtc = { ...@@ -534,7 +534,7 @@ static struct platform_device m48t59_rtc = {
}, },
}; };
static int __devinit mostek_probe(struct platform_device *op) static int mostek_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
...@@ -746,7 +746,7 @@ void __irq_entry timer_interrupt(int irq, struct pt_regs *regs) ...@@ -746,7 +746,7 @@ void __irq_entry timer_interrupt(int irq, struct pt_regs *regs)
set_irq_regs(old_regs); set_irq_regs(old_regs);
} }
void __devinit setup_sparc64_timer(void) void setup_sparc64_timer(void)
{ {
struct clock_event_device *sevt; struct clock_event_device *sevt;
unsigned long pstate; unsigned long pstate;
...@@ -844,7 +844,7 @@ unsigned long long sched_clock(void) ...@@ -844,7 +844,7 @@ unsigned long long sched_clock(void)
>> SPARC64_NSEC_PER_CYC_SHIFT; >> SPARC64_NSEC_PER_CYC_SHIFT;
} }
int __devinit read_current_timer(unsigned long *timer_val) int read_current_timer(unsigned long *timer_val)
{ {
*timer_val = tick_ops->get_tick(); *timer_val = tick_ops->get_tick();
return 0; return 0;
......
arch/sparc/mm/init_64.c
View file @ 7c9503b8
...@@ -87,8 +87,8 @@ static unsigned long cpu_pgsz_mask; ...@@ -87,8 +87,8 @@ static unsigned long cpu_pgsz_mask;
#define MAX_BANKS 32 #define MAX_BANKS 32
static struct linux_prom64_registers pavail[MAX_BANKS] __devinitdata; static struct linux_prom64_registers pavail[MAX_BANKS];
static int pavail_ents __devinitdata; static int pavail_ents;
static int cmp_p64(const void *a, const void *b) static int cmp_p64(const void *a, const void *b)
{ {
...@@ -1931,7 +1931,7 @@ void __init paging_init(void) ...@@ -1931,7 +1931,7 @@ void __init paging_init(void)
printk("Booting Linux...\n"); printk("Booting Linux...\n");
} }
int __devinit page_in_phys_avail(unsigned long paddr) int page_in_phys_avail(unsigned long paddr)
{ {
int i; int i;
......
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