From fa029a6ab471d618d9fe6b22ab3b84cdf8677cf2 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 7 Feb 2004 17:41:50 -0800 Subject: [PATCH] [PATCH] Fix ppa/imm warnings From: Simplify the code, eliminate an unused variable warning. --- drivers/scsi/imm.c | 13 ++----------- drivers/scsi/ppa.c | 15 ++------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index 66825f08ef85d..0a3f553f3d817 100644 --- 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 dfefed5126d4a..b3b976e04663c 100644 --- 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); -- 2.53.0