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

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

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

arch/sparc/include/asm/parport.h

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static inline unsigned int get_dma_residue(unsigned int dmanr) 
	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 config = op->resource[1].start;
@@ -192,7 +192,7 @@ static int __devinit ecpp_probe(struct platform_device *op) 
	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);

	int slot = p->dma;
@@ -242,7 +242,7 @@ static struct platform_driver ecpp_driver = { 
		.of_match_table = ecpp_match,

	},

	.probe			= ecpp_probe,

	.remove			= __devexit_p(ecpp_remove),

	.remove			= ecpp_remove,

};



static int parport_pc_find_nonpci_ports(int autoirq, int autodma)

arch/sparc/include/asm/timer_64.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct sparc64_tick_ops { 
extern struct sparc64_tick_ops *tick_ops;



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



#endif /* _SPARC64_TIMER_H */

arch/sparc/kernel/apc.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define APC_DEVNAME "apc"



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_writeb(val, offs) 	(sbus_writeb(val, regs+offs))
@@ -138,7 +138,7 @@ static const struct file_operations 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;

arch/sparc/kernel/auxio_64.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static const struct of_device_id 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;

	unsigned long size;

arch/sparc/kernel/central.c

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct fhc { 
	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;
@@ -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);

	int err = -ENOMEM;
@@ -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);

	int err = -ENOMEM;