diff options
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/au1xxx-ide.c | 1 | ||||
| -rw-r--r-- | drivers/ide/gayle.c | 1 | ||||
| -rw-r--r-- | drivers/ide/ide-floppy.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide.c | 3 | ||||
| -rw-r--r-- | drivers/ide/ide_platform.c | 1 | ||||
| -rw-r--r-- | drivers/ide/palm_bk3710.c | 1 | ||||
| -rw-r--r-- | drivers/ide/tx4938ide.c | 1 | ||||
| -rw-r--r-- | drivers/ide/tx4939ide.c | 1 |
8 files changed, 3 insertions, 10 deletions
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c index 07ea58084068..4d181a918d72 100644 --- a/drivers/ide/au1xxx-ide.c +++ b/drivers/ide/au1xxx-ide.c @@ -586,7 +586,6 @@ static int au_ide_remove(struct platform_device *dev) static struct platform_driver au1200_ide_driver = { .driver = { .name = "au1200-ide", - .owner = THIS_MODULE, }, .probe = au_ide_probe, .remove = au_ide_remove, diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c index 97a2f9dc75d8..901e6ebfeb96 100644 --- a/drivers/ide/gayle.c +++ b/drivers/ide/gayle.c @@ -179,7 +179,6 @@ static struct platform_driver amiga_gayle_ide_driver = { .remove = __exit_p(amiga_gayle_ide_remove), .driver = { .name = "amiga-gayle-ide", - .owner = THIS_MODULE, }, }; diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 3d42043fec51..8c6363cdd208 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -487,7 +487,7 @@ static void ide_floppy_setup(ide_drive_t *drive) * it. It should be fixed as of version 1.9, but to be on the safe side * we'll leave the limitation below for the 2.2.x tree. */ - if (!strncmp((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI", 20)) { + if (strstarts((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI")) { drive->atapi_flags |= IDE_AFLAG_ZIP_DRIVE; /* This value will be visible in the /proc/ide/hdx/settings */ drive->pc_delay = IDEFLOPPY_PC_DELAY; @@ -498,7 +498,7 @@ static void ide_floppy_setup(ide_drive_t *drive) * Guess what? The IOMEGA Clik! drive also needs the above fix. It makes * nasty clicking noises without it, so please don't remove this. */ - if (strncmp((char *)&id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) { + if (strstarts((char *)&id[ATA_ID_PROD], "IOMEGA Clik!")) { blk_queue_max_hw_sectors(drive->queue, 64); drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE; /* IOMEGA Clik! drives do not support lock/unlock commands */ diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 2ce6268a2734..e29b02ca9e91 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -101,8 +101,7 @@ void ide_device_put(ide_drive_t *drive) struct device *host_dev = drive->hwif->host->dev[0]; struct module *module = host_dev ? host_dev->driver->owner : NULL; - if (module) - module_put(module); + module_put(module); #endif put_device(&drive->gendev); } diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index d48de6de503e..2b43be3bca0a 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c @@ -125,7 +125,6 @@ static int plat_ide_remove(struct platform_device *pdev) static struct platform_driver platform_ide_driver = { .driver = { .name = "pata_platform", - .owner = THIS_MODULE, }, .probe = plat_ide_probe, .remove = plat_ide_remove, diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c index ba20d18c0373..8012e43bf8f6 100644 --- a/drivers/ide/palm_bk3710.c +++ b/drivers/ide/palm_bk3710.c @@ -386,7 +386,6 @@ MODULE_ALIAS("platform:palm_bk3710"); static struct platform_driver platform_bk_driver = { .driver = { .name = "palm_bk3710", - .owner = THIS_MODULE, }, }; diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c index 68edd4f58a28..40a3f55b08dd 100644 --- a/drivers/ide/tx4938ide.c +++ b/drivers/ide/tx4938ide.c @@ -198,7 +198,6 @@ static int __exit tx4938ide_remove(struct platform_device *pdev) static struct platform_driver tx4938ide_driver = { .driver = { .name = "tx4938ide", - .owner = THIS_MODULE, }, .remove = __exit_p(tx4938ide_remove), }; diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 4ecdee5eca83..67d4a7d4acc8 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c @@ -618,7 +618,6 @@ static int tx4939ide_resume(struct platform_device *dev) static struct platform_driver tx4939ide_driver = { .driver = { .name = MODNAME, - .owner = THIS_MODULE, }, .remove = __exit_p(tx4939ide_remove), .resume = tx4939ide_resume, |