[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>

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index c743e68c33aadca3894017ed2ba1c82cde5cff52..8d5b8722fa3edbc7402620bc76843d490e305bcd 100644 (file)
--- 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
 
        if (dev->resource[PCI_ROM_RESOURCE].start) {
                pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
+               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+                       (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
        }
 
        if (bus_speed <= 33)

diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 3d9c7afc86950ad1660852bba5eb680199cde1b2..9828039cc64b5ed52b1669ae8437f15c6133a14d 100644 (file)
--- 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
 #ifdef __i386__
        if (dev->resource[PCI_ROM_RESOURCE].start) {
                pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
+               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+                       (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
        }
 #endif
 

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index be334da7a7549b4fb44f82e59000450875c1abfb..7da550281cf23a112d61b6cc68d946ad0e540d19 100644 (file)
--- 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
                        pci_write_config_dword(dev, PCI_ROM_ADDRESS,
                                dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
                        printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
-                               dev->resource[PCI_ROM_RESOURCE].start);
+                               (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
                }
                pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
        } else {

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index acd63173199bbf17acd1a306da2160cda563c511..20d5965726432c1c65c9f6307860dad6b721cf47 100644 (file)
--- 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
        if (dev->resource[PCI_ROM_RESOURCE].start) {
                pci_write_config_dword(dev, PCI_ROM_ADDRESS,
                        dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-                       name, dev->resource[PCI_ROM_RESOURCE].start);
+               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+                       (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
        }
 
 #ifdef CONFIG_PPC_PMAC

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 22d17548ecdbd273628c19c303cc914f8c5b25d3..ffbef74013e607f4f4b18fc705ce5a8336516d9f 100644 (file)
--- 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
        if (dev->resource[PCI_ROM_RESOURCE].start) {
                pci_write_config_dword(dev, PCI_ROM_ADDRESS,
                        dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-                       name, dev->resource[PCI_ROM_RESOURCE].start);
+               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+                       (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
        }
 
        /*