diff options
author | Helge Deller <deller@gmx.de> | 2018-01-02 14:45:42 -0500 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2018-01-02 15:01:01 -0500 |
commit | 04903c06b4854d2e85f6e3c368d5d48c4ce55f09 (patch) | |
tree | d4a57e6729e7dd4b7df041f63df2166070238e9b | |
parent | 63b2c373137b16d948b08cffacc6abfcf4cffea6 (diff) |
parisc: Show unhashed HPA of Dino chip
Fixes: ad67b74d2469d9b8 ("printk: hash addresses printed with %p")
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r-- | drivers/parisc/dino.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 0b3fb99d9b89..7390fb8ca9d1 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
@@ -303,7 +303,7 @@ static void dino_mask_irq(struct irq_data *d) | |||
303 | struct dino_device *dino_dev = irq_data_get_irq_chip_data(d); | 303 | struct dino_device *dino_dev = irq_data_get_irq_chip_data(d); |
304 | int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS); | 304 | int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS); |
305 | 305 | ||
306 | DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, d->irq); | 306 | DBG(KERN_WARNING "%s(0x%px, %d)\n", __func__, dino_dev, d->irq); |
307 | 307 | ||
308 | /* Clear the matching bit in the IMR register */ | 308 | /* Clear the matching bit in the IMR register */ |
309 | dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq)); | 309 | dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq)); |
@@ -316,7 +316,7 @@ static void dino_unmask_irq(struct irq_data *d) | |||
316 | int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS); | 316 | int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS); |
317 | u32 tmp; | 317 | u32 tmp; |
318 | 318 | ||
319 | DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, d->irq); | 319 | DBG(KERN_WARNING "%s(0x%px, %d)\n", __func__, dino_dev, d->irq); |
320 | 320 | ||
321 | /* | 321 | /* |
322 | ** clear pending IRQ bits | 322 | ** clear pending IRQ bits |
@@ -396,7 +396,7 @@ ilr_again: | |||
396 | if (mask) { | 396 | if (mask) { |
397 | if (--ilr_loop > 0) | 397 | if (--ilr_loop > 0) |
398 | goto ilr_again; | 398 | goto ilr_again; |
399 | printk(KERN_ERR "Dino 0x%p: stuck interrupt %d\n", | 399 | printk(KERN_ERR "Dino 0x%px: stuck interrupt %d\n", |
400 | dino_dev->hba.base_addr, mask); | 400 | dino_dev->hba.base_addr, mask); |
401 | return IRQ_NONE; | 401 | return IRQ_NONE; |
402 | } | 402 | } |
@@ -553,7 +553,7 @@ dino_fixup_bus(struct pci_bus *bus) | |||
553 | struct pci_dev *dev; | 553 | struct pci_dev *dev; |
554 | struct dino_device *dino_dev = DINO_DEV(parisc_walk_tree(bus->bridge)); | 554 | struct dino_device *dino_dev = DINO_DEV(parisc_walk_tree(bus->bridge)); |
555 | 555 | ||
556 | DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n", | 556 | DBG(KERN_WARNING "%s(0x%px) bus %d platform_data 0x%px\n", |
557 | __func__, bus, bus->busn_res.start, | 557 | __func__, bus, bus->busn_res.start, |
558 | bus->bridge->platform_data); | 558 | bus->bridge->platform_data); |
559 | 559 | ||
@@ -854,7 +854,7 @@ static int __init dino_common_init(struct parisc_device *dev, | |||
854 | res->flags = IORESOURCE_IO; /* do not mark it busy ! */ | 854 | res->flags = IORESOURCE_IO; /* do not mark it busy ! */ |
855 | if (request_resource(&ioport_resource, res) < 0) { | 855 | if (request_resource(&ioport_resource, res) < 0) { |
856 | printk(KERN_ERR "%s: request I/O Port region failed " | 856 | printk(KERN_ERR "%s: request I/O Port region failed " |
857 | "0x%lx/%lx (hpa 0x%p)\n", | 857 | "0x%lx/%lx (hpa 0x%px)\n", |
858 | name, (unsigned long)res->start, (unsigned long)res->end, | 858 | name, (unsigned long)res->start, (unsigned long)res->end, |
859 | dino_dev->hba.base_addr); | 859 | dino_dev->hba.base_addr); |
860 | return 1; | 860 | return 1; |