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
This commit is contained in:
@@ -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. */
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user