Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 08f46de9a0e7c293db34cf44f9451d18ef609770

Authored by Greg Kroah-Hartman
1 parent 176dfc633b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 5 changed files with 9 additions and 7 deletions Side-by-side Diff

drivers/ide/pci/aec62xx.c
Diff comments   View file @ 08f46de
... ... @@ -254,7 +254,8 @@
254 254  
255 255 if (dev->resource[PCI_ROM_RESOURCE].start) {
256 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 261 if (bus_speed <= 33)
drivers/ide/pci/cmd64x.c
Diff comments   View file @ 08f46de
... ... @@ -609,7 +609,8 @@
609 609 #ifdef __i386__
610 610 if (dev->resource[PCI_ROM_RESOURCE].start) {
611 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 615 #endif
615 616  
drivers/ide/pci/hpt34x.c
Diff comments   View file @ 08f46de
... ... @@ -176,7 +176,7 @@
176 176 pci_write_config_dword(dev, PCI_ROM_ADDRESS,
177 177 dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
178 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 181 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
182 182 } else {
drivers/ide/pci/pdc202xx_new.c
Diff comments   View file @ 08f46de
... ... @@ -313,8 +313,8 @@
313 313 if (dev->resource[PCI_ROM_RESOURCE].start) {
314 314 pci_write_config_dword(dev, PCI_ROM_ADDRESS,
315 315 dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
316   - printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
317   - name, dev->resource[PCI_ROM_RESOURCE].start);
  316 + printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
  317 + (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
318 318 }
319 319  
320 320 #ifdef CONFIG_PPC_PMAC
drivers/ide/pci/pdc202xx_old.c
Diff comments   View file @ 08f46de
... ... @@ -544,8 +544,8 @@
544 544 if (dev->resource[PCI_ROM_RESOURCE].start) {
545 545 pci_write_config_dword(dev, PCI_ROM_ADDRESS,
546 546 dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
547   - printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
548   - name, dev->resource[PCI_ROM_RESOURCE].start);
  547 + printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
  548 + (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
549 549 }
550 550  
551 551 /*