diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2013-01-01 16:02:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-12 15:28:45 -0800 |
| commit | b7c13f76fda994284521f6ef996119c25282bdeb (patch) | |
| tree | c30d2ab35dfa6f3013b0e663d1260c39db91ce1d /arch/sparc/include/asm/parport.h | |
| parent | 4e4d78f1c1a08f085a1972b9af92960af70a07c6 (diff) | |
| download | olio-linux-3.10-b7c13f76fda994284521f6ef996119c25282bdeb.tar.xz olio-linux-3.10-b7c13f76fda994284521f6ef996119c25282bdeb.zip | |
sparc: remove __devinit, __devexit annotations
__devinit, __devexit annotations are nops - so drop them.
Likewise for __devexit_p.
Adjusted alignment of arguments when needed.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/parport.h')
| -rw-r--r-- | arch/sparc/include/asm/parport.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h index cb33608cc68..c55291e5b83 100644 --- a/arch/sparc/include/asm/parport.h +++ b/arch/sparc/include/asm/parport.h @@ -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 @@ out_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); 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) |