diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index cb647f49914b..1004c6b46432 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -426,7 +426,6 @@ ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never for int ptr, pcr, val, i; while ((idport = pc873xx_basetab[index++])) { - /* XXX should check first to see if this location is already claimed */ /* @@ -488,7 +487,6 @@ ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode) /* XXX mode never for val = inb(idport + 1); /* XXX we should create a driver instance for every port found */ if (pc873xx_porttab[val & 0x3] != ppc->ppc_base) { - /* First try to change the port address to that requested... */ switch (ppc->ppc_base) { @@ -710,7 +708,6 @@ ppc_smc37c66xgt_detect(struct ppc_data *ppc, int chipset_mode) int port_address[] = { -1 /* disabled */ , 0x3bc, 0x378, 0x278 }; - #define cio csr+1 /* config IO port is either 0x3F1 or 0x371 */ /* @@ -1256,7 +1253,6 @@ ppc_generic_detect(struct ppc_data *ppc, int chipset_mode) */ static int ppc_detect(struct ppc_data *ppc, int chipset_mode) { - #ifdef PPC_PROBE_CHIPSET int i, mode; @@ -1570,7 +1566,6 @@ ppcintr(void *arg) /* check if ppc driver has programmed the * nFault interrupt */ if (ppc->ppc_irqstat & PPC_IRQ_nFAULT) { - w_ecr(ppc, ecr | PPC_nFAULT_INTR); ppc->ppc_irqstat &= ~PPC_IRQ_nFAULT; } else { @@ -1607,7 +1602,6 @@ ppcintr(void *arg) } } } else if (ppc->ppc_irqstat & PPC_IRQ_FIFO) { - /* classic interrupt I/O */ ppc->ppc_irqstat &= ~PPC_IRQ_FIFO; } diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c index 582638183f13..bb52b7370d16 100644 --- a/sys/dev/ppc/ppc_acpi.c +++ b/sys/dev/ppc/ppc_acpi.c @@ -81,7 +81,6 @@ static device_method_t ppc_acpi_methods[] = { #else DEVMETHOD(ppbus_write, ppc_write), #endif - { 0, 0 } }; diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c index fb23a8104ee0..869050050225 100644 --- a/sys/dev/ppc/ppc_isa.c +++ b/sys/dev/ppc/ppc_isa.c @@ -76,7 +76,6 @@ static device_method_t ppc_isa_methods[] = { DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync), DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_isa_write), - { 0, 0 } }; @@ -234,7 +233,6 @@ ppc_isa_write(device_t dev, char *buf, int len, int how) /* wait for an empty fifo */ while (!(r_ecr(ppc) & PPC_FIFO_EMPTY)) { - for (spin=100; spin; spin--) if (r_ecr(ppc) & PPC_FIFO_EMPTY) goto fifo_empty; diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c index b3a2826c6f0c..58a34d0d2700 100644 --- a/sys/dev/ppc/ppc_pci.c +++ b/sys/dev/ppc/ppc_pci.c @@ -67,7 +67,6 @@ static device_method_t ppc_pci_methods[] = { DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync), DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_write), - { 0, 0 } }; diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c index 5acdd1f05b83..42f77a450fb3 100644 --- a/sys/dev/ppc/ppc_puc.c +++ b/sys/dev/ppc/ppc_puc.c @@ -69,7 +69,6 @@ static device_method_t ppc_puc_methods[] = { DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync), DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_write), - { 0, 0 } };