Remove superfluous Super I/O res0/res1 lines.

The pc_keyboard_init() function no longer takes any base addresses
since r5152 (passed in via res0/res1 variables previously), so drop them.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6063 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 177a7b8a10eb419ebc467f39dd3614efa46e1e63..9b5847a9e0ea59a5bcf1713de062d2abd94abe36 100644 (file)
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -57,7 +57,6 @@ static void f71889_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case F71889_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 9c5296df6cf4724c0bc1d0d12badaa928322e526..9b6984ecb279d90fbf346a4c302b31e3fbe5ea9b 100644 (file)
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
        struct superio_ite_it8671f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -48,8 +48,6 @@ static void init(device_t dev)
        case IT8671F_PP: /* TODO. */
                break;
        case IT8671F_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        case IT8671F_KBCM: /* TODO. */

diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index e1d2f50a0f07a5e6acf6d60e98fc7b1cb400b9d5..675ddba77371a268ace23bd1306948e5ea4d8db2 100644 (file)
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
        struct superio_ite_it8673f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -50,8 +50,6 @@ static void init(device_t dev)
        case IT8673F_FAN: /* TODO. */
                break;
        case IT8673F_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        case IT8673F_KBCM: /* TODO. */

diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index 04cdd2908399ddbaaa4430a358cefa5d6f8d887b..a60c469f71463b106ee0ab9b7ef7fd3eda6c0592 100644 (file)
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -28,7 +28,7 @@
 static void init(device_t dev)
 {
        struct superio_ite_it8705f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;

diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 4d41ac34122575d28541364bd3640fb43c3b8f28..d551a5be8c7ac770b14540a2d5a84c1e04deda40 100644 (file)
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -46,7 +46,7 @@ static void pnp_exit_ext_func_mode(device_t dev)
 static void it8712f_init(device_t dev)
 {
        struct superio_ite_it8712f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -67,8 +67,6 @@ static void it8712f_init(device_t dev)
        case IT8712F_EC: /* TODO. */
                break;
        case IT8712F_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                set_kbc_ps2_mode();
                pc_keyboard_init(&conf->keyboard);
                break;

diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 0d4ee68c794cdc7a9f8ab1ae9b01d4c5d98edfaa..38475d80656a7c470ae25cdfddb3084835b4d4ee 100644 (file)
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -78,7 +78,7 @@ static void init_ec(u16 base)
 static void it8716f_init(device_t dev)
 {
        struct superio_ite_it8716f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -99,8 +99,6 @@ static void it8716f_init(device_t dev)
                init_ec(res0->base + EC_INDEX_PORT);
                break;
        case IT8716F_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 3bf2f2fc656daba36f3cd28ecfb0f4612e5faf58..e3f469f86a53b6db737a6f4ca434b9785cc9faa2 100644 (file)
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
        struct superio_ite_it8718f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -50,8 +50,6 @@ static void init(device_t dev)
        case IT8718F_EC: /* TODO. */
                break;
        case IT8718F_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        case IT8718F_KBCM: /* TODO. */

diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 0ea594a778bb3c7172307154915138ddbb3fd0a9..189c2d1dbf49cdb0e488453071eced5f2e76fb17 100644 (file)
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -34,7 +34,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc8374_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
@@ -52,8 +52,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC8374_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index b4a47d523c4ff9ba9594488c23a068b200598ae0..04f75fbaa9abc3d3e79999b11e51cfefe557cc18 100644 (file)
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -30,7 +30,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc87309_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled) {
                return;
@@ -46,8 +46,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC87309_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 2202f354389937d17e387715c04df40df2554ac5..83f10b93f75868f6e0f1700823f716a039a433be 100644 (file)
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -40,7 +40,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc87351_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
@@ -58,8 +58,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC87351_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index d4874ff1a98cabac80ebeaaadbb053ebafd12233..d85d10a64848e6590f3fd5bc8ed4ea004c8fad41 100644 (file)
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -34,7 +34,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc87360_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
@@ -52,8 +52,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC87360_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 22e26898d2b953af5860f51bd1e71e5350c349ab..a38f386d60c63ff68cc0f294b6e5be63489c9b74 100644 (file)
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -34,7 +34,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc87366_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
@@ -52,8 +52,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC87366_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index d3117146395b3edcd26ba32b0c1210e192871095..1eee9595bfbb17964d439c1e04ddf8b714531a18 100644 (file)
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -35,7 +35,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc87417_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
@@ -53,8 +53,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC87417_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index f8e4483168205a72368a804dd1c0774886d49bd7..82efb3c4ee8721f2e5ca1eedd3e82f892e2fa60c 100644 (file)
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -32,7 +32,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc87427_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
@@ -50,8 +50,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case PC87427_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index 6ded3a07e330818311761a76e6d6b0197d5275e9..bd14919ecae23363247e4d08ba6861df5d502ec2 100644 (file)
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc97307_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled) {
                return;
@@ -53,8 +53,6 @@ static void init(device_t dev)
                pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 Mhz */
                pnp_set_enable(dev, 1); /* Enable keyboard */
 
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
 

diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 96dfbef327576cc5dd2f43acbf1acd37db7fb630..2dced4189827df79d8b172a9f91e326ba7134b23 100644 (file)
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
        struct superio_nsc_pc97317_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled) {
                return;
@@ -53,8 +53,6 @@ static void init(device_t dev)
                pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 Mhz */
                pnp_set_enable(dev, 1); /* Enable keyboard */
 
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
 

diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index 31767e0d5e480a0bffc6ec2ad3009647ea644131..0fc5eaaf65e62d1646c4273a858df06158770906 100644 (file)
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
        struct superio_smsc_fdc37m60x_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled) {
                return;
@@ -51,8 +51,6 @@ static void init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case FDC37M60X_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        case FDC37M60X_AUX: /* TODO. */

diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 77fadd8a85a1090b40ac960073ce5d6496ff1261..7fd1a9d8e16a503e38ff45acebc469b667e33567 100644 (file)
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -126,7 +126,7 @@ static void lpc47b272_pnp_enable(device_t dev)
 static void lpc47b272_init(device_t dev)
 {
        struct superio_smsc_lpc47b272_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -143,8 +143,6 @@ static void lpc47b272_init(device_t dev)
                break;
 
        case LPC47B272_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 9df7ee9dc561ddedc08481e19d7fa16c77843d39..1e4ac804e789f8686fc4f33a21a2847240ec8368 100644 (file)
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -67,7 +67,7 @@ static void enable_hwm_smbus(device_t dev)
 static void lpc47b397_init(device_t dev)
 {
        struct superio_smsc_lpc47b397_config *conf;
-       struct resource *res0, *res1;
+       struct resource *res0;
        if (!dev->enabled) {
                return;
        }
@@ -82,8 +82,6 @@ static void lpc47b397_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case LPC47B397_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 2288ec9d159981e3e1917d463f0b925f9587311f..1cb7e7d2621571a02718b43e1a4eb60f9a23a255 100644 (file)
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -124,7 +124,7 @@ static void lpc47m10x_pnp_enable(device_t dev)
 static void lpc47m10x_init(device_t dev)
 {
        struct superio_smsc_lpc47m10x_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -141,8 +141,6 @@ static void lpc47m10x_init(device_t dev)
                break;
 
        case LPC47M10X2_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index b05e1014ab33ea5da966c84db78b93e6c570edc2..c221583b89380ea7a93d28300ddd32bd5a8b17fd 100644 (file)
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -99,7 +99,7 @@ static void lpc47m15x_pnp_enable(device_t dev)
 static void lpc47m15x_init(device_t dev)
 {
        struct superio_smsc_lpc47m15x_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -116,8 +116,6 @@ static void lpc47m15x_init(device_t dev)
                break;
 
        case LPC47M15X_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 0fa2c36d76cf02e2d4f3d1415a7f44fddd2bf800..99e978305231e0c21ea90d8003d5baba38a3e093 100644 (file)
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -205,7 +205,7 @@ static void smsc_pnp_enable(device_t dev)
 static void smsc_init(device_t dev)
 {
        struct superio_smsc_smscsuperio_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
        int i, ld;
 
        /* Do not initialize disabled devices. */
@@ -230,8 +230,6 @@ static void smsc_init(device_t dev)
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com2);
        } else if (ld == logical_device_table[i].devs[LD_KBC]) {
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
        }
 }

diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 7ed236775958f3a8a1cd5a195cc284a31e14070f..b94f4fee1b51ba66c4704b2f19a8f0586f8f5133 100644 (file)
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -40,7 +40,7 @@ static void pnp_exit_ext_func_mode(device_t dev)
 static void w83627dhg_init(device_t dev)
 {
        struct superio_winbond_w83627dhg_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -55,8 +55,6 @@ static void w83627dhg_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83627DHG_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index cc65a651608d66ed02423dec537e9a141ac100e2..1dd8f760bbd43ffb871f50ef5e96c83704c8aed7 100644 (file)
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -108,7 +108,7 @@ static void init_hwm(u16 base)
 static void w83627ehg_init(device_t dev)
 {
        struct superio_winbond_w83627ehg_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -123,8 +123,6 @@ static void w83627ehg_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83627EHG_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        case W83627EHG_HWM:

diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 3dbe8333fc3924a14af33d6e199485293e450a03..42ad46e3e1d09e20e92d1a36dd0ee95ecaa54ead 100644 (file)
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -129,7 +129,7 @@ static void init_hwm(u16 base)
 static void w83627hf_init(device_t dev)
 {
        struct superio_winbond_w83627hf_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -144,8 +144,6 @@ static void w83627hf_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83627HF_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        case W83627HF_HWM:

diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c
index 021937e9886dcb142bbe86521dd99fdace259ec3..4efe9aa4a64728965365c7bfeb799702ca9eeff2 100644 (file)
--- a/src/superio/winbond/w83627thf/superio.c
+++ b/src/superio/winbond/w83627thf/superio.c
@@ -46,7 +46,7 @@ static void w83627thf_exit_ext_func_mode(device_t dev)
 static void w83627thf_init(device_t dev)
 {
        struct superio_winbond_w83627thf_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -61,8 +61,6 @@ static void w83627thf_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83627THF_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 08044a8f5393d8e234aaafcea3fb5b28b7772583..601ccb602795fe348fa4089310a9aa5713a77a33 100644 (file)
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -45,7 +45,7 @@ static void w83627thg_exit_ext_func_mode(device_t dev)
 static void w83627thg_init(device_t dev)
 {
        struct superio_winbond_w83627thg_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -60,8 +60,6 @@ static void w83627thg_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83627THG_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index c80eb95d17a4e2bfa50ef1d1d2935ab027d2676b..ed22b2166c6bb96d1d59dd7f37f0aefe04a9cefd 100644 (file)
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -73,7 +73,7 @@ static void set_uart_clock_source(device_t dev, u8 uart_clock)
 static void w83627uhg_init(device_t dev)
 {
        struct superio_winbond_w83627uhg_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -110,8 +110,6 @@ static void w83627uhg_init(device_t dev)
                init_uart8250(res0->base, &conf->com6);
                break;
        case W83627UHG_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 7ebfd293f38ba7215ffb7b126dd48cc825978d1d..457180bde9d94e1b601914776e2d9799b82e7d29 100644 (file)
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -44,7 +44,7 @@ static void w83977f_exit_ext_func_mode(device_t dev)
 static void w83977f_init(device_t dev)
 {
        struct superio_winbond_w83977f_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -59,8 +59,6 @@ static void w83977f_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83977F_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }

diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 3cfb1de543a4a1822991c87082d0b7a17f39e8cb..39b6da94cc6cc41d07df6b741905d593dac22abd 100644 (file)
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -46,7 +46,7 @@ static void w83977tf_exit_ext_func_mode(device_t dev)
 static void w83977tf_init(device_t dev)
 {
        struct superio_winbond_w83977tf_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -61,8 +61,6 @@ static void w83977tf_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83977TF_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }