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

Commit 2427ddd8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed 



Based on a patch series originally 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 b60ba834

drivers/ieee1394/ohci1394.c

+1 −1
Original line number Diff line number Diff line
@@ -3217,7 +3217,7 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, 
{

	struct hpsb_host *host;

	struct ti_ohci *ohci;	/* shortcut to currently handled device */

	unsigned long ohci_base;

	resource_size_t ohci_base;



        if (pci_enable_device(dev))

		FAIL(-ENXIO, "Failed to enable OHCI hardware");

drivers/isdn/hisax/hfc_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1688,7 +1688,7 @@ setup_hfcpci(struct IsdnCard *card) 
				printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");

				return (0);

			}

			cs->hw.hfcpci.pci_io = (char *) dev_hfcpci->resource[ 1].start;

			cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start;

			printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name);

		} else {

			printk(KERN_WARNING "HFC-PCI: No PCI card found\n");

drivers/net/8139cp.c

+1 −1
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct cp_private *cp;

	int rc;

	void __iomem *regs;

	long pciaddr;

	resource_size_t pciaddr;

	unsigned int addr_len, i, pci_using_dac;

	u8 pci_rev;

drivers/pcmcia/rsrc_nonstatic.c

+7 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static DEFINE_MUTEX(rsrc_mutex); 
======================================================================*/



static struct resource *

make_resource(unsigned long b, unsigned long n, int flags, char *name)

make_resource(resource_size_t b, resource_size_t n, int flags, char *name)

{

	struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
@@ -86,8 +86,8 @@ make_resource(unsigned long b, unsigned long n, int flags, char *name) 
}



static struct resource *

claim_region(struct pcmcia_socket *s, unsigned long base, unsigned long size,

	     int type, char *name)

claim_region(struct pcmcia_socket *s, resource_size_t base,

		resource_size_t size, int type, char *name)

{

	struct resource *res, *parent;
@@ -519,10 +519,10 @@ struct pcmcia_align_data { 


static void

pcmcia_common_align(void *align_data, struct resource *res,

		    unsigned long size, unsigned long align)

			resource_size_t size, resource_size_t align)

{

	struct pcmcia_align_data *data = align_data;

	unsigned long start;

	resource_size_t start;

	/*

	 * Ensure that we have the correct start address

	 */
@@ -533,8 +533,8 @@ pcmcia_common_align(void *align_data, struct resource *res, 
}



static void

pcmcia_align(void *align_data, struct resource *res,

	     unsigned long size, unsigned long align)

pcmcia_align(void *align_data, struct resource *res, resource_size_t size,

		resource_size_t align)

{

	struct pcmcia_align_data *data = align_data;

	struct resource_map *m;

drivers/serial/8250_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -594,8 +594,8 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board, 
	else

		offset += idx * board->uart_offset;



	maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) /

		(8 << board->reg_shift);

	maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) >>

		(board->reg_shift + 3);



	if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)

		return 1;