diff options
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 1898c7b4790..88cdd1a937d 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -144,7 +144,7 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,  	size = resource_size(res);  	min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM; -	align = resource_alignment(res); +	align = pci_resource_alignment(dev, res);  	/* First, try exact prefetching match.. */  	ret = pci_bus_alloc_resource(bus, res, size, align, min, @@ -178,7 +178,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)  	struct pci_bus *bus;  	int ret; -	align = resource_alignment(res); +	align = pci_resource_alignment(dev, res);  	if (!align) {  		dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "  			"alignment) %pR flags %#lx\n", @@ -259,7 +259,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)  		if (!(r->flags) || r->parent)  			continue; -		r_align = resource_alignment(r); +		r_align = pci_resource_alignment(dev, r);  		if (!r_align) {  			dev_warn(&dev->dev, "BAR %d: bogus alignment "  				"%pR flags %#lx\n", @@ -271,7 +271,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)  			struct resource_list *ln = list->next;  			if (ln) -				align = resource_alignment(ln->res); +				align = pci_resource_alignment(ln->dev, ln->res);  			if (r_align > align) {  				tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);  | 
