Commit 6f6f8c2f authored by Milind Arun Choudhary's avatar Milind Arun Choudhary Committed by Greg Kroah-Hartman
Browse files

PCI: ROUND_UP macro cleanup in drivers/pci 



ROUND_UP macro cleanup, use ALIGN where ever appropriate

Signed-off-by: default avatarMilind Arun Choudhary <milindchoudhary@gmail.com>
Acked-by: default avatarScott Murray <scottm@somanetworks.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent caa51716

drivers/pci/hotplug/cpci_hotplug_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ extern int cpci_debug; 
#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)

#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)



#define ROUND_UP(x, a)		(((x) + (a) - 1) & ~((a) - 1))





u8 cpci_get_attention_status(struct slot* slot)

{

drivers/pci/setup-bus.c

+3 −5
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#define DBG(x...)

#endif



#define ROUND_UP(x, a)		(((x) + (a) - 1) & ~((a) - 1))



static void pbus_assign_resources_sorted(struct pci_bus *bus)

{

	struct pci_dev *dev;
@@ -310,7 +308,7 @@ static void pbus_size_io(struct pci_bus *bus) 
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)

	size = (size & 0xff) + ((size & ~0xffUL) << 2);

#endif

	size = ROUND_UP(size + size1, 4096);

	size = ALIGN(size + size1, 4096);

	if (!size) {

		b_res->flags = 0;

		return;
@@ -378,11 +376,11 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long 


		if (!align)

			min_align = align1;

		else if (ROUND_UP(align + min_align, min_align) < align1)

		else if (ALIGN(align + min_align, min_align) < align1)

			min_align = align1 >> 1;

		align += aligns[order];

	}

	size = ROUND_UP(size, min_align);

	size = ALIGN(size, min_align);

	if (!size) {

		b_res->flags = 0;

		return 1;