NCR5380 patches from mailing list
Subsystems (2)
cover NCR5380 patches from mailing list
As requested by James, these are the NCR5380 patches that were reviewed on the linux-scsi mailing list.
I've changed my acked-by tags to signed-off-by tags. git am and git format-patch helpfully moved the email From: headers to the message bodies, but not the Date: headers, and it chucked out the recipient headers found in the email submissions and everything after the "---" cut lines, which might make further review more difficult...
Geert Uytterhoeven (1):
g_NCR5380: Kill compiler warning if builtin
Nicholas Mc Guire (1):
ncr5380: Harmonize jiffies conversion with msecs_to_jiffies
Wolfram Sang (1):
ncr5380: Drop owner assignment from platform_drivers
drivers/scsi/NCR5380.c | 10 +++++----- drivers/scsi/atari_NCR5380.c | 2 +- drivers/scsi/atari_scsi.c | 1 - drivers/scsi/g_NCR5380.c | 8 ++++---- drivers/scsi/mac_scsi.c | 1 - drivers/scsi/sun3_scsi.c | 1 - 6 files changed, 10 insertions(+), 13 deletions(-)
Signature · 1 line
2.0.5
PATCH 1/3 ncr5380: Drop owner assignment from platform_drivers
From: Wolfram Sang <[email protected]>
This platform_driver does not need to set an owner, it will be populated by the driver core.
--- drivers/scsi/atari_scsi.c | 1 - drivers/scsi/mac_scsi.c | 1 - drivers/scsi/sun3_scsi.c | 1 - 3 files changed, 3 deletions(-)
drivers/scsi/atari_scsi.c +0 -1
@@ -1014,7 +1014,6 @@ static struct platform_driver atari_scsi_driver = { .remove = __exit_p(atari_scsi_remove), .driver = { .name = DRV_MODULE_NAME, - .owner = THIS_MODULE, }, };
drivers/scsi/mac_scsi.c +0 -1
@@ -483,7 +483,6 @@ static struct platform_driver mac_scsi_driver = { .remove = __exit_p(mac_scsi_remove), .driver = { .name = DRV_MODULE_NAME, - .owner = THIS_MODULE, }, };
drivers/scsi/sun3_scsi.c +0 -1
@@ -676,7 +676,6 @@ static struct platform_driver sun3_scsi_driver = { .remove = __exit_p(sun3_scsi_remove), .driver = { .name = DRV_MODULE_NAME, - .owner = THIS_MODULE, }, };
Signature · 1 line
2.0.5
PATCH 2/3 g_NCR5380: Kill compiler warning if builtin
In reply to Finn ThainFrom: Geert Uytterhoeven <[email protected]>
If CONFIG_SCSI_GENERIC_NCR5380=y:
drivers/scsi/g_NCR5380.c:727: warning: 'id_table' defined but not used
In the non-modular case, MODULE_DEVICE_TABLE() expands to nothing, and id_table is not referenced.
Correct the existing #ifdef to fix this.
--- drivers/scsi/g_NCR5380.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/g_NCR5380.c +1 -1
@@ -723,7 +723,7 @@ module_param(ncr_53c400a, int, 0);module_param (dtc_3181e, int,0 );MODULE_LICENSE ("GPL" ); -#ifndef SCSI_G_NCR5380_MEM +#if !defined(SCSI_G_NCR5380_MEM) && defined(MODULE) static struct isapnp_device_id id_table[] = { { ISAPNP_ANY_ID, ISAPNP_ANY_ID,
Signature · 1 line
2.0.5
PATCH 3/3 ncr5380: Harmonize jiffies conversion with msecs_to_jiffies
In reply to Finn ThainFrom: Nicholas Mc Guire <[email protected]>
Instances of var * HZ / 1000 are replaced by msecs_to_jiffies(var). In addition some timing constants that assumed HZ 100 were adjusted to HZ independent settings based on review comments from Michael Schmitz <[email protected]> and review of the original drivers in 1.0.31 and 2.2.16.
--- drivers/scsi/NCR5380.c | 10 +++++----- drivers/scsi/atari_NCR5380.c | 2 +- drivers/scsi/g_NCR5380.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/NCR5380.c +5 -5
@@ -474,11 +474,11 @@ static void NCR5380_print_phase(struct Scsi_Host *instance)*/ #ifndef USLEEP_SLEEP /* 20 ms (reasonable hard disk speed) */ -#define USLEEP_SLEEP (20*HZ/1000) +#define USLEEP_SLEEP msecs_to_jiffies(20)#endif /* 300 RPM (floppy speed) */ #ifndef USLEEP_POLL -#define USLEEP_POLL (200*HZ/1000) +#define USLEEP_POLL msecs_to_jiffies(200)#endif #ifndef USLEEP_WAITLONG /* RvC: (reasonable time to wait on select error) */
@@ -576,7 +576,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,if ((mask & possible) && (request_irq (i, &probe_intr,0 ,"NCR-probe" ,NULL ) ==0 )) trying_irqs |= mask; - timeout = jiffies + (250 *HZ /1000 ); + timeout = jiffies +msecs_to_jiffies (250 ); probe_irq =NO_IRQ ;/*
@@ -634,7 +634,7 @@ static void prepare_info(struct Scsi_Host *instance)"sg_tablesize %d, this_id %d, " "flags { %s%s%s}, "#if defined(USLEEP_POLL ) && defined(USLEEP_WAITLONG ) -"USLEEP_POLL %d, USLEEP_WAITLONG %d, " +"USLEEP_POLL %lu, USLEEP_WAITLONG %lu, " #endif"options { %s} " , instance->hostt->name, instance->io_port, instance->n_io_port,
@@ -1346,7 +1346,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)* selection. */ - timeout = jiffies + (250 *HZ /1000 ); + timeout = jiffies +msecs_to_jiffies (250 );/* * XXX very interesting - we're seeing a bounce where the BSY we
drivers/scsi/atari_NCR5380.c +1 -1
@@ -1486,7 +1486,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)* selection. */ - timeout = jiffies + (250 *HZ /1000 ); + timeout = jiffies +msecs_to_jiffies (250 );/* * XXX very interesting - we're seeing a bounce where the BSY we
drivers/scsi/g_NCR5380.c +3 -3
@@ -57,9 +57,9 @@*/ /* settings for DTC3181E card with only Mustek scanner attached */ -#define USLEEP_POLL 1 -#define USLEEP_SLEEP 20 -#define USLEEP_WAITLONG 500 +#define USLEEP_POLL msecs_to_jiffies(10) +#define USLEEP_SLEEP msecs_to_jiffies(200) +#define USLEEP_WAITLONG msecs_to_jiffies(5000)#define AUTOPROBE_IRQ
Signature · 1 line
2.0.5