diff options
Diffstat (limited to 'drivers/ide/ide_platform.c')
| -rw-r--r-- | drivers/ide/ide_platform.c | 14 | 
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index 962693b10a1..ba4bfbead24 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c @@ -22,11 +22,9 @@  #include <linux/interrupt.h>  #include <linux/io.h> -static void __devinit plat_ide_setup_ports(struct ide_hw *hw, -					   void __iomem *base, -					   void __iomem *ctrl, -					   struct pata_platform_info *pdata, -					   int irq) +static void plat_ide_setup_ports(struct ide_hw *hw, void __iomem *base, +				 void __iomem *ctrl, +				 struct pata_platform_info *pdata, int irq)  {  	unsigned long port = (unsigned long)base;  	int i; @@ -48,7 +46,7 @@ static const struct ide_port_info platform_ide_port_info = {  	.chipset		= ide_generic,  }; -static int __devinit plat_ide_probe(struct platform_device *pdev) +static int plat_ide_probe(struct platform_device *pdev)  {  	struct resource *res_base, *res_alt, *res_irq;  	void __iomem *base, *alt_base; @@ -115,7 +113,7 @@ out:  	return ret;  } -static int __devexit plat_ide_remove(struct platform_device *pdev) +static int plat_ide_remove(struct platform_device *pdev)  {  	struct ide_host *host = dev_get_drvdata(&pdev->dev); @@ -130,7 +128,7 @@ static struct platform_driver platform_ide_driver = {  		.owner = THIS_MODULE,  	},  	.probe = plat_ide_probe, -	.remove = __devexit_p(plat_ide_remove), +	.remove = plat_ide_remove,  };  static int __init platform_ide_init(void)  |