Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pata_hpt37x: fold 'if' statement into 'switch'

Browse source 
hpt37x_init_one() has a large *if* statement which should really be folded into
the *switch* statement that currently constitutes its *else* branch, reducing
one level of indentation...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Sergei Shtylyov 2011-01-10 22:31:13 +03:00 • committed by Jeff Garzik
parent 40d69ba029
commit 910f7bb164
1 changed files with 43 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
drivers/ata/pata_hpt37x.c
View file

@ -24,7 +24,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "pata_hpt37x" #define DRV_NAME "pata_hpt37x"
#define DRV_VERSION "0.6.20" #define DRV_VERSION "0.6.21"
struct hpt_clock { struct hpt_clock {
u8 xfer_speed; u8 xfer_speed;
@ -838,7 +838,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
if (rc) if (rc)
return rc; return rc;
if (dev->device == PCI_DEVICE_ID_TTI_HPT366) { switch (dev->device) {
case PCI_DEVICE_ID_TTI_HPT366:
/* May be a later chip in disguise. Check */ /* May be a later chip in disguise. Check */
/* Older chips are in the HPT366 driver. Ignore them */ /* Older chips are in the HPT366 driver. Ignore them */
if (rev < 3) if (rev < 3)
@ -867,50 +868,46 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
"please report (%d).\n", rev); "please report (%d).\n", rev);
return -ENODEV; return -ENODEV;
} }
} else { break;
switch (dev->device) { case PCI_DEVICE_ID_TTI_HPT372:
case PCI_DEVICE_ID_TTI_HPT372: /* 372N if rev >= 2 */
/* 372N if rev >= 2 */ if (rev >= 2)
if (rev >= 2) return -ENODEV;
return -ENODEV; ppi[0] = &info_hpt372;
ppi[0] = &info_hpt372; chip_table = &hpt372a;
chip_table = &hpt372a; break;
break; case PCI_DEVICE_ID_TTI_HPT302:
case PCI_DEVICE_ID_TTI_HPT302: /* 302N if rev > 1 */
/* 302N if rev > 1 */ if (rev > 1)
if (rev > 1) return -ENODEV;
return -ENODEV; ppi[0] = &info_hpt302;
ppi[0] = &info_hpt302; /* Check this */
/* Check this */ chip_table = &hpt302;
chip_table = &hpt302; break;
break; case PCI_DEVICE_ID_TTI_HPT371:
case PCI_DEVICE_ID_TTI_HPT371: if (rev > 1)
if (rev > 1) return -ENODEV;
return -ENODEV; ppi[0] = &info_hpt302;
ppi[0] = &info_hpt302; chip_table = &hpt371;
chip_table = &hpt371; /*
/* * Single channel device, master is not present but the BIOS
* Single channel device, master is not present * (or us for non x86) must mark it absent
* but the BIOS (or us for non x86) must mark it */
* absent pci_read_config_byte(dev, 0x50, &mcr1);
*/ mcr1 &= ~0x04;
pci_read_config_byte(dev, 0x50, &mcr1); pci_write_config_byte(dev, 0x50, mcr1);
mcr1 &= ~0x04; break;
pci_write_config_byte(dev, 0x50, mcr1); case PCI_DEVICE_ID_TTI_HPT374:
break; chip_table = &hpt374;
case PCI_DEVICE_ID_TTI_HPT374: if (!(PCI_FUNC(dev->devfn) & 1))
chip_table = &hpt374; *ppi = &info_hpt374_fn0;
if (!(PCI_FUNC(dev->devfn) & 1)) else
*ppi = &info_hpt374_fn0; *ppi = &info_hpt374_fn1;
else break;
*ppi = &info_hpt374_fn1; default:
break; pr_err(DRV_NAME ": PCI table is bogus, please report (%d).\n",
default: dev->device);
pr_err(DRV_NAME return -ENODEV;
": PCI table is bogus, please report (%d).\n",
dev->device);
return -ENODEV;
}
} }
/* Ok so this is a chip we support */ /* Ok so this is a chip we support */