clean up some small nix/k10 nits Reference: /n/atom/patch/applied2013/nixnits20130822 Date: Fri Aug 23 05:06:59 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/k10/pci.c Fri Aug 23 05:05:12 2013 +++ /sys/src/nix/k10/pci.c Fri Aug 23 05:05:13 2013 @@ -283,7 +283,7 @@ return maxubn; } -static uchar +static uchar pIIxget(Pcidev *router, uchar link) { uchar pirq; @@ -293,13 +293,13 @@ return (pirq < 16)? pirq: 0; } -static void +static void pIIxset(Pcidev *router, uchar link, uchar irq) { pcicfgw8(router, link, irq); } -static uchar +static uchar viaget(Pcidev *router, uchar link) { uchar pirq; @@ -310,7 +310,7 @@ return (link & 1)? (pirq >> 4): (pirq & 15); } -static void +static void viaset(Pcidev *router, uchar link, uchar irq) { uchar pirq; @@ -327,7 +327,7 @@ ushort vid; ushort did; uchar (*get)(Pcidev *, uchar); - void (*set)(Pcidev *, uchar, uchar); + void (*set)(Pcidev *, uchar, uchar); }; static Bridge southbridges[] = { @@ -374,8 +374,8 @@ Router *r; Slot *e; - // Search for PCI interrupt routing table in BIOS - for(p = (uchar *)KADDR(0xf0000); p < (uchar *)KADDR(0xfffff); p += 16) + /* Search for PCI interrupt routing table in BIOS */ + for(p = (uchar*)KADDR(0xf0000); p < (uchar*)KADDR(0xfffff); p += 16) if(p[0] == '$' && p[1] == 'P' && p[2] == 'I' && p[3] == 'R') break; @@ -426,7 +426,7 @@ if(pci == nil) continue; pin = pcicfgr8(pci, PciINTP); - if(pin == 0 || pin == 0xff) + if(pin == 0 || pin == 0xff) continue; map = &e->maps[(pin - 1) * 3]; @@ -505,7 +505,7 @@ continue; /* * If we have found a PCI-to-Cardbus bridge, make sure - * it has no valid mappings anymore. + * it has no valid mappings anymore. */ for(p = pciroot; p != nil; p = p->link){ if (p->ccrb == 6 && p->ccru == 7) { --- /sys/src/nix/k10/usbohci.c Fri Aug 23 05:05:15 2013 +++ /sys/src/nix/k10/usbohci.c Fri Aug 23 05:05:17 2013 @@ -2481,7 +2481,6 @@ hcca = lomallocalign(sizeof(Hcca), 256); if(hcca == nil) panic("usbhreset: no memory for Hcca"); - memset(hcca, 0, sizeof(*hcca)); ctlr->hcca = hcca; mkqhtree(ctlr);