[PATCH] Fix ppa/imm warnings

From: <viro@parcelfarce.linux.theplanet.co.uk>

Simplify the code, eliminate an unused variable warning.

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 66825f08ef85d48f0e49edf213e6f59ef9af6f54..0a3f553f3d8179f5a5e3d632d2b673990c8ed3f4 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -1208,19 +1208,10 @@ static int __imm_attach(struct parport *pb)
                goto out1;
 
        /* now the glue ... */
-       switch (dev->mode) {
-       case IMM_NIBBLE:
-       case IMM_PS2:
+       if (dev->mode == IMM_NIBBLE || dev->mode == IMM_PS2)
                ports = 3;
-               break;
-       case IMM_EPP_8:
-       case IMM_EPP_16:
-       case IMM_EPP_32:
+       else
                ports = 8;
-               break;
-       default:        /* Never gets here */
-               BUG();
-       }
 
        INIT_WORK(&dev->imm_tq, imm_interrupt, dev);
 

diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index dfefed5126d4ab7f959077ca714663fb7161e404..b3b976e04663ccacfa3f7c4dd18281a8832afcbd 100644 (file)
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -1069,21 +1069,10 @@ static int __ppa_attach(struct parport *pb)
                goto out1;
 
        /* now the glue ... */
-       switch (dev->mode) {
-       case PPA_NIBBLE:
-               ports = 3;
-               break;
-       case PPA_PS2:
+       if (dev->mode == PPA_NIBBLE || dev->mode == PPA_PS2)
                ports = 3;
-               break;
-       case PPA_EPP_8:
-       case PPA_EPP_16:
-       case PPA_EPP_32:
+       else
                ports = 8;
-               break;
-       default:        /* Never gets here */
-               BUG();
-       }
 
        INIT_WORK(&dev->ppa_tq, ppa_interrupt, dev);