diff options
Diffstat (limited to 'drivers/parisc')
| -rw-r--r-- | drivers/parisc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/parisc/dino.c | 13 | ||||
| -rw-r--r-- | drivers/parisc/hppb.c | 6 | ||||
| -rw-r--r-- | drivers/parisc/pdc_stable.c | 6 | ||||
| -rw-r--r-- | drivers/parisc/superio.c | 2 |
5 files changed, 11 insertions, 17 deletions
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig index 620264936341..592de566e72f 100644 --- a/drivers/parisc/Kconfig +++ b/drivers/parisc/Kconfig @@ -128,6 +128,7 @@ config SUPERIO config CHASSIS_LCD_LED bool "Chassis LCD and LED support" default y + select VM_EVENT_COUNTERS help Say Y here if you want to enable support for the Heartbeat, Disk/Network activities LEDs on some PA-RISC machines, diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 8e4e86b78428..9eae9834bcc7 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -580,15 +580,13 @@ dino_fixup_bus(struct pci_bus *bus) } - DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n", + DBG("DEBUG %s assigning %d [%pR]\n", dev_name(&bus->self->dev), i, - bus->self->resource[i].start, - bus->self->resource[i].end); + &bus->self->resource[i]); WARN_ON(pci_assign_resource(bus->self, i)); - DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n", + DBG("DEBUG %s after assign %d [%pR]\n", dev_name(&bus->self->dev), i, - bus->self->resource[i].start, - bus->self->resource[i].end); + &bus->self->resource[i]); } } @@ -772,8 +770,7 @@ dino_bridge_init(struct dino_device *dino_dev, const char *name) result = ccio_request_resource(dino_dev->hba.dev, &res[i]); if (result < 0) { printk(KERN_ERR "%s: failed to claim PCI Bus address " - "space %d (0x%lx-0x%lx)!\n", name, i, - (unsigned long)res[i].start, (unsigned long)res[i].end); + "space %d (%pR)!\n", name, i, &res[i]); return result; } } diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index 815db175d427..898208e4f302 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c @@ -74,10 +74,8 @@ static int hppb_probe(struct parisc_device *dev) status = ccio_request_resource(dev, &card->mmio_region); if(status < 0) { - printk(KERN_ERR "%s: failed to claim HP-PB " - "bus space (0x%08llx, 0x%08llx)\n", - __FILE__, (unsigned long long) card->mmio_region.start, - (unsigned long long) card->mmio_region.end); + printk(KERN_ERR "%s: failed to claim HP-PB bus space (%pR)\n", + __FILE__, &card->mmio_region); } return 0; diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index 246a92f677e4..0f54ab6260df 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c @@ -212,12 +212,10 @@ pdcspath_store(struct pdcspath_entry *entry) entry, devpath, entry->addr); /* addr, devpath and count must be word aligned */ - if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) { - printk(KERN_ERR "%s: an error occurred when writing to PDC.\n" + if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) + WARN(1, KERN_ERR "%s: an error occurred when writing to PDC.\n" "It is likely that the Stable Storage data has been corrupted.\n" "Please check it carefully upon next reboot.\n", __func__); - WARN_ON(1); - } /* kobject is already registered */ entry->ready = 2; diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index 5003458980d3..ac6e8e7a02df 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -274,7 +274,7 @@ superio_init(struct pci_dev *pcidev) else printk(KERN_ERR PFX "USB regulator not initialized!\n"); - if (request_irq(pdev->irq, superio_interrupt, IRQF_DISABLED, + if (request_irq(pdev->irq, superio_interrupt, 0, SUPERIO, (void *)sio)) { printk(KERN_ERR PFX "could not get irq\n"); |