From: Andrew Morton Cc: Alan Cox Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/ata/pata_sil680.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff -puN drivers/ata/pata_sil680.c~pata_sil680-suspend-resume-tidy drivers/ata/pata_sil680.c --- a/drivers/ata/pata_sil680.c~pata_sil680-suspend-resume-tidy +++ a/drivers/ata/pata_sil680.c @@ -356,13 +356,12 @@ static int sil680_init_one(struct pci_de if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); - switch(sil680_init_chip(pdev)) - { - case 0: - port_info[0] = port_info[1] = &info_slow; - break; - case 0x30: - return -ENODEV; + switch (sil680_init_chip(pdev)) { + case 0: + port_info[0] = port_info[1] = &info_slow; + break; + case 0x30: + return -ENODEV; } return ata_pci_init_one(pdev, port_info, 2); } @@ -375,7 +374,6 @@ static int sil680_reinit_one(struct pci_ static const struct pci_device_id sil680[] = { { PCI_VDEVICE(CMD, PCI_DEVICE_ID_SII_680), }, - { }, }; _