Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c7459d1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] 64bit resource: fix up printks for resources in networks 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aa0a2ddc

drivers/net/3c59x.c

+4 −2
Original line number Diff line number Diff line
@@ -1408,8 +1408,10 @@ static int __devinit vortex_probe1(struct device *gendev, 
		}



		if (print_info) {

			printk(KERN_INFO "%s: CardBus functions mapped %8.8lx->%p\n",

				print_name, pci_resource_start(pdev, 2),

			printk(KERN_INFO "%s: CardBus functions mapped "

				"%16.16llx->%p\n",

				print_name,

				(unsigned long long)pci_resource_start(pdev, 2),

				vp->cb_fn_base);

		}

		EL3WINDOW(2);

drivers/net/8139cp.c

+5 −4
Original line number Diff line number Diff line
@@ -1883,8 +1883,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	if (pci_resource_len(pdev, 1) < CP_REGS_SIZE) {

		rc = -EIO;

		printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",

		       pci_resource_len(pdev, 1), pci_name(pdev));

		printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",

		       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));

		goto err_out_res;

	}
@@ -1916,8 +1916,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	regs = ioremap(pciaddr, CP_REGS_SIZE);

	if (!regs) {

		rc = -EIO;

		printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",

		       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));

		printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%llx) on pci dev %s\n",

			(unsigned long long)pci_resource_len(pdev, 1),

			(unsigned long long)pciaddr, pci_name(pdev));

		goto err_out_res;

	}

	dev->base_addr = (unsigned long) regs;

drivers/net/8139too.c

+3 −3
Original line number Diff line number Diff line
@@ -1341,9 +1341,9 @@ static int rtl8139_open (struct net_device *dev) 
	netif_start_queue (dev);



	if (netif_msg_ifup(tp))

		printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"

			" GP Pins %2.2x %s-duplex.\n",

			dev->name, pci_resource_start (tp->pci_dev, 1),

		printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#llx IRQ %d"

			" GP Pins %2.2x %s-duplex.\n", dev->name,

			(unsigned long long)pci_resource_start (tp->pci_dev, 1),

			dev->irq, RTL_R8 (MediaStatus),

			tp->mii.full_duplex ? "full" : "half");

drivers/net/e100.c

+2 −2
Original line number Diff line number Diff line
@@ -2678,9 +2678,9 @@ static int __devinit e100_probe(struct pci_dev *pdev, 
		goto err_out_free;

	}



	DPRINTK(PROBE, INFO, "addr 0x%lx, irq %d, "

	DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "

		"MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",

		pci_resource_start(pdev, 0), pdev->irq,

		(unsigned long long)pci_resource_start(pdev, 0), pdev->irq,

		netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],

		netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);

drivers/net/skge.c

+2 −2
Original line number Diff line number Diff line
@@ -3354,8 +3354,8 @@ static int __devinit skge_probe(struct pci_dev *pdev, 
	if (err)

		goto err_out_free_irq;



	printk(KERN_INFO PFX DRV_VERSION " addr 0x%lx irq %d chip %s rev %d\n",

	       pci_resource_start(pdev, 0), pdev->irq,

	printk(KERN_INFO PFX DRV_VERSION " addr 0x%llx irq %d chip %s rev %d\n",

	       (unsigned long long)pci_resource_start(pdev, 0), pdev->irq,

	       skge_board_name(hw), hw->chip_rev);



	if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)