diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 18:15:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 12:23:59 -0400 |
commit | 08f46de9a0e7c293db34cf44f9451d18ef609770 (patch) | |
tree | 83c28b79165adee350aad8cb9d4e2e59486acf56 /drivers/ide | |
parent | 176dfc633bbe4e03f4557d2beeefb4f0cc7f0efa (diff) |
[PATCH] 64bit resource: fix up printks for resources in ide drivers
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/pci/aec62xx.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/cmd64x.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 4 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index c743e68c33aa..8d5b8722fa3e 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
@@ -254,7 +254,8 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch | |||
254 | 254 | ||
255 | if (dev->resource[PCI_ROM_RESOURCE].start) { | 255 | if (dev->resource[PCI_ROM_RESOURCE].start) { |
256 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); | 256 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); |
257 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start); | 257 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, |
258 | (unsigned long)dev->resource[PCI_ROM_RESOURCE].start); | ||
258 | } | 259 | } |
259 | 260 | ||
260 | if (bus_speed <= 33) | 261 | if (bus_speed <= 33) |
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 3d9c7afc8695..9828039cc64b 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -609,7 +609,8 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha | |||
609 | #ifdef __i386__ | 609 | #ifdef __i386__ |
610 | if (dev->resource[PCI_ROM_RESOURCE].start) { | 610 | if (dev->resource[PCI_ROM_RESOURCE].start) { |
611 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); | 611 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); |
612 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start); | 612 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, |
613 | (unsigned long)dev->resource[PCI_ROM_RESOURCE].start); | ||
613 | } | 614 | } |
614 | #endif | 615 | #endif |
615 | 616 | ||
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index be334da7a754..7da550281cf2 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -176,7 +176,7 @@ static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev, const cha | |||
176 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, | 176 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, |
177 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); | 177 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); |
178 | printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n", | 178 | printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n", |
179 | dev->resource[PCI_ROM_RESOURCE].start); | 179 | (unsigned long)dev->resource[PCI_ROM_RESOURCE].start); |
180 | } | 180 | } |
181 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0); | 181 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0); |
182 | } else { | 182 | } else { |
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index acd63173199b..20d596572643 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -313,8 +313,8 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha | |||
313 | if (dev->resource[PCI_ROM_RESOURCE].start) { | 313 | if (dev->resource[PCI_ROM_RESOURCE].start) { |
314 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, | 314 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, |
315 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); | 315 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); |
316 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", | 316 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, |
317 | name, dev->resource[PCI_ROM_RESOURCE].start); | 317 | (unsigned long)dev->resource[PCI_ROM_RESOURCE].start); |
318 | } | 318 | } |
319 | 319 | ||
320 | #ifdef CONFIG_PPC_PMAC | 320 | #ifdef CONFIG_PPC_PMAC |
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 22d17548ecdb..ffbef74013e6 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -544,8 +544,8 @@ static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev, const c | |||
544 | if (dev->resource[PCI_ROM_RESOURCE].start) { | 544 | if (dev->resource[PCI_ROM_RESOURCE].start) { |
545 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, | 545 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, |
546 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); | 546 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); |
547 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", | 547 | printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, |
548 | name, dev->resource[PCI_ROM_RESOURCE].start); | 548 | (unsigned long)dev->resource[PCI_ROM_RESOURCE].start); |
549 | } | 549 | } |
550 | 550 | ||
551 | /* | 551 | /* |