diff options
Diffstat (limited to 'target/linux/adm5120/files/drivers')
5 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c index 71f8ad6b8..92a4d1390 100644 --- a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c +++ b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c @@ -148,7 +148,7 @@ static void rb153_pata_setup_port(struct ata_host *ah) ap->ioaddr.data_addr = info->iobase + RB153_CF_REG_DATA; } -static __devinit int rb153_pata_driver_probe(struct platform_device *pdev) +static int rb153_pata_driver_probe(struct platform_device *pdev) { unsigned int irq; int gpio; @@ -222,7 +222,7 @@ err_free_gpio: return ret; } -static __devexit int rb153_pata_driver_remove(struct platform_device *pdev) +static int rb153_pata_driver_remove(struct platform_device *pdev) { struct ata_host *ah = platform_get_drvdata(pdev); struct rb153_cf_info *info = ah->private_data; @@ -235,7 +235,7 @@ static __devexit int rb153_pata_driver_remove(struct platform_device *pdev) static struct platform_driver rb153_pata_platform_driver = { .probe = rb153_pata_driver_probe, - .remove = __devexit_p(rb153_pata_driver_remove), + .remove = rb153_pata_driver_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, diff --git a/target/linux/adm5120/files/drivers/mtd/trxsplit.c b/target/linux/adm5120/files/drivers/mtd/trxsplit.c index 6f60264ac..76cbdc749 100644 --- a/target/linux/adm5120/files/drivers/mtd/trxsplit.c +++ b/target/linux/adm5120/files/drivers/mtd/trxsplit.c @@ -53,8 +53,7 @@ static int trxsplit_checktrx(struct mtd_info *mtd, unsigned long offset) size_t retlen; int err; - err = mtd->read(mtd, offset, sizeof(trx_hdr), &retlen, - (void *)&trx_hdr); + err = mtd_read(mtd, offset, sizeof(trx_hdr), &retlen, (void *)&trx_hdr); if (err) { printk(KERN_ALERT PFX "unable to read from '%s'\n", mtd->name); goto err_out; diff --git a/target/linux/adm5120/files/drivers/net/adm5120sw.c b/target/linux/adm5120/files/drivers/net/adm5120sw.c index d80a6a3a1..7fbabb00e 100644 --- a/target/linux/adm5120/files/drivers/net/adm5120sw.c +++ b/target/linux/adm5120/files/drivers/net/adm5120sw.c @@ -1083,7 +1083,7 @@ static void adm5120_switch_cleanup(void) adm5120_switch_rx_ring_free(); } -static int __devinit adm5120_switch_probe(struct platform_device *pdev) +static int adm5120_switch_probe(struct platform_device *pdev) { u32 t; int i, err; diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c index 99ea9d530..798fd2208 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c @@ -109,7 +109,7 @@ static void admhc_adm5120_remove(struct usb_hcd *hcd, usb_put_hcd(hcd); } -static int __devinit admhc_adm5120_start(struct usb_hcd *hcd) +static int admhc_adm5120_start(struct usb_hcd *hcd) { struct admhcd *ahcd = hcd_to_admhcd(hcd); int ret; diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c index 7dfa80448..f721ec1ff 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c @@ -39,7 +39,6 @@ #include <linux/io.h> #include <asm/irq.h> -#include <asm/system.h> #include <asm/unaligned.h> #include <asm/byteorder.h> |