diff options
| -rw-r--r-- | linux/dev/drivers/block/floppy.c | 6 | ||||
| -rw-r--r-- | linux/src/drivers/net/8390.c | 3 | ||||
| -rw-r--r-- | linux/src/drivers/scsi/ppa.c | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/linux/dev/drivers/block/floppy.c b/linux/dev/drivers/block/floppy.c index d297e61..83943ee 100644 --- a/linux/dev/drivers/block/floppy.c +++ b/linux/dev/drivers/block/floppy.c @@ -1413,7 +1413,7 @@ static int interpret_errors(void) */ static void setup_rw_floppy(void) { - int i,ready_date,r, flags,dflags; + int i, ready_date, r, flags; timeout_fn function; flags = raw_cmd->flags; @@ -1436,7 +1436,6 @@ static void setup_rw_floppy(void) if (wait_for_completion(ready_date,function)) return; } - dflags = DRS->flags; if ((flags & FD_RAW_READ) || (flags & FD_RAW_WRITE)) setup_DMA(); @@ -4276,11 +4275,10 @@ void cleanup_module(void) * resource contention. */ void floppy_eject(void) { - int dummy; if(floppy_grab_irq_and_dma()==0) { lock_fdc(MAXTIMEOUT,0); - dummy=fd_eject(0); + fd_eject(0); process_fd_request(); floppy_release_irq_and_dma(); } diff --git a/linux/src/drivers/net/8390.c b/linux/src/drivers/net/8390.c index 9864106..93c485d 100644 --- a/linux/src/drivers/net/8390.c +++ b/linux/src/drivers/net/8390.c @@ -706,13 +706,10 @@ int ethdev_init(struct device *dev) printk(version); if (dev->priv == NULL) { - struct ei_device *ei_local; - dev->priv = kmalloc(sizeof(struct ei_device), GFP_KERNEL); if (dev->priv == NULL) return -ENOMEM; memset(dev->priv, 0, sizeof(struct ei_device)); - ei_local = (struct ei_device *)dev->priv; } dev->hard_start_xmit = &ei_start_xmit; diff --git a/linux/src/drivers/scsi/ppa.c b/linux/src/drivers/scsi/ppa.c index 5063a67..e5e0cb8 100644 --- a/linux/src/drivers/scsi/ppa.c +++ b/linux/src/drivers/scsi/ppa.c @@ -259,7 +259,6 @@ int ppa_detect(Scsi_Host_Template * host) struct Scsi_Host *hreg; int ports; int i, nhosts; - unsigned short ppb; printk("ppa: Version %s\n", PPA_VERSION); nhosts = 0; @@ -267,7 +266,7 @@ int ppa_detect(Scsi_Host_Template * host) for (i = 0; i < parbus_no; i++) { if (parbus_base[i] == 0x0000) continue; - ppb = ppa_hosts[i].base = parbus_base[i]; + ppa_hosts[i].base = parbus_base[i]; /* sanity checks */ if (check_region(parbus_base[i], |