From c313696143a66793bde85033a6b23f57a8fab6ea Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 5 Mar 2003 05:39:41 -0800 Subject: [PATCH] Fix up some timeouts to use the proper types. (While "signed long" is the same in practice, it is technically incorrect, and the new anal type-checker complains). --- drivers/parport/ieee1284.c | 2 +- drivers/parport/ieee1284_ops.c | 8 ++++---- sound/pci/ac97/ac97_codec.c | 4 ++-- sound/pci/intel8x0.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index ba6259d825fad..784d976f755ac 100644 --- a/drivers/parport/ieee1284.c +++ b/drivers/parport/ieee1284.c @@ -170,7 +170,7 @@ int parport_wait_peripheral(struct parport *port, { int ret; int usec; - long deadline; + unsigned long deadline; unsigned char status; usec = port->physport->spintime; /* usecs of fast polling */ diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c index 838dee5ee5c17..1c423e053da71 100644 --- a/drivers/parport/ieee1284_ops.c +++ b/drivers/parport/ieee1284_ops.c @@ -58,7 +58,7 @@ size_t parport_ieee1284_write_compat (struct parport *port, parport_write_control (port, ctl); parport_data_forward (port); while (count < len) { - long expire = jiffies + dev->timeout; + unsigned long expire = jiffies + dev->timeout; long wait = (HZ + 99) / 100; unsigned char mask = (PARPORT_STATUS_ERROR | PARPORT_STATUS_BUSY); @@ -431,7 +431,7 @@ size_t parport_ieee1284_ecp_write_data (struct parport *port, | PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT); for (written = 0; written < len; written++, buf++) { - long expire = jiffies + port->cad->timeout; + unsigned long expire = jiffies + port->cad->timeout; unsigned char byte; byte = *buf; @@ -520,7 +520,7 @@ size_t parport_ieee1284_ecp_read_data (struct parport *port, parport_write_control (port, ctl | PARPORT_CONTROL_AUTOFD); while (count < len) { - long expire = jiffies + dev->timeout; + unsigned long expire = jiffies + dev->timeout; unsigned char byte; int command; @@ -668,7 +668,7 @@ size_t parport_ieee1284_ecp_write_addr (struct parport *port, PARPORT_CONTROL_AUTOFD | PARPORT_CONTROL_INIT); for (written = 0; written < len; written++, buf++) { - long expire = jiffies + port->cad->timeout; + unsigned long expire = jiffies + port->cad->timeout; unsigned char byte; byte = *buf; diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index bb2c63746091e..adbef4bf478cb 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -1808,7 +1808,7 @@ static void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name) */ static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem) { - signed long end_time; + unsigned long end_time; end_time = jiffies + timeout; do { unsigned short ext_mid; @@ -1866,7 +1866,7 @@ int snd_ac97_mixer(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97) int err; ac97_t *ac97; char name[64]; - signed long end_time; + unsigned long end_time; static snd_device_ops_t ops = { .dev_free = snd_ac97_dev_free, }; diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 20f6c7a788be4..740a36733361f 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -1741,7 +1741,7 @@ static void do_delay(intel8x0_t *chip) static int snd_intel8x0_ich_chip_init(intel8x0_t *chip) { - signed long end_time; + unsigned long end_time; unsigned int cnt, status, nstatus; /* put logic to right state */ -- 2.53.0