The 'io' local variable isn't actually necessary in the inner block of artop_init_one() -- removing it will allow to simplify a follow-up patch... Suggested-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx> Signed-off-by: Sergey Shtylyov <s.shtylyov@xxxxxx> --- Changes in version 4: - new patch. drivers/ata/pata_artop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c index ad3c5808aaad..b734cafb8783 100644 --- a/drivers/ata/pata_artop.c +++ b/drivers/ata/pata_artop.c @@ -28,7 +28,7 @@ #include <linux/ata.h> #define DRV_NAME "pata_artop" -#define DRV_VERSION "0.4.6" +#define DRV_VERSION "0.4.7" /* * The ARTOP has 33 Mhz and "over clocked" timing tables. Until we @@ -398,11 +398,9 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) ppi[0] = &info_6210; else if (id->driver_data == 1) /* 6260 */ ppi[0] = &info_626x; - else if (id->driver_data == 2) { /* 6280 or 6280 + fast */ - unsigned long io = pci_resource_start(pdev, 4); - + else if (id->driver_data == 2) { /* 6280 or 6280 + fast */ ppi[0] = &info_628x; - if (inb(io) & 0x10) + if (inb(pci_resource_start(pdev, 4)) & 0x10) ppi[0] = &info_628x_fast; } -- 2.26.3