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

Commit 327e22df authored by Jon Loeliger's avatar Jon Loeliger Committed by Kumar Gala
Browse files

[POWERPC] Replace use of GET_64BIT(prop, i) with of_read_number(). 



Remove uses of hack GET_64BIT() property macro and use
the more general of_read_number() function from prom.h
as suggested by Milton.

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b533f8ae

arch/powerpc/kernel/pci_64.c

+4 −5
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ static unsigned int pci_parse_of_flags(u32 addr0) 
	return flags;

}



#define GET_64BIT(prop, i)	((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1])



static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)

{
@@ -250,8 +249,8 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev) 
		flags = pci_parse_of_flags(addrs[0]);

		if (!flags)

			continue;

		base = GET_64BIT(addrs, 1);

		size = GET_64BIT(addrs, 3);

		base = of_read_number(&addrs[1], 2);

		size = of_read_number(&addrs[3], 2);

		if (!size)

			continue;

		i = addrs[0] & 0xff;
@@ -417,7 +416,7 @@ void __devinit of_scan_pci_bridge(struct device_node *node, 
	i = 1;

	for (; len >= 32; len -= 32, ranges += 8) {

		flags = pci_parse_of_flags(ranges[0]);

		size = GET_64BIT(ranges, 6);

		size = of_read_number(&ranges[6], 2);

		if (flags == 0 || size == 0)

			continue;

		if (flags & IORESOURCE_IO) {
@@ -436,7 +435,7 @@ void __devinit of_scan_pci_bridge(struct device_node *node, 
			res = bus->resource[i];

			++i;

		}

		res->start = GET_64BIT(ranges, 1);

		res->start = of_read_number(&ranges[1], 2);

		res->end = res->start + size - 1;

		res->flags = flags;

		fixup_resource(res, dev);