Commit 70b9f7dc authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

x86/pci: remove flag in pci_cfg_space_size_ext 



so let pci_cfg_space_size call it directly without flag.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 98db6f19

arch/x86/pci/fixup.c

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SIEMENS, 0x0015, 
 */

static void fam10h_pci_cfg_space_size(struct pci_dev *dev)

{

	dev->cfg_size = pci_cfg_space_size_ext(dev, 0);

	dev->cfg_size = pci_cfg_space_size_ext(dev);

}



DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, fam10h_pci_cfg_space_size);

drivers/pci/probe.c

+17 −16
Original line number Diff line number Diff line
@@ -842,13 +842,25 @@ static void set_pcie_port_type(struct pci_dev *pdev) 
 * reading the dword at 0x100 which must either be 0 or a valid extended

 * capability header.

 */

int pci_cfg_space_size_ext(struct pci_dev *dev, unsigned check_exp_pcix)

int pci_cfg_space_size_ext(struct pci_dev *dev)

{

	int pos;

	u32 status;



	if (!check_exp_pcix)

		goto skip;

	if (pci_read_config_dword(dev, 256, &status) != PCIBIOS_SUCCESSFUL)

		goto fail;

	if (status == 0xffffffff)

		goto fail;



	return PCI_CFG_SPACE_EXP_SIZE;



 fail:

	return PCI_CFG_SPACE_SIZE;

}



int pci_cfg_space_size(struct pci_dev *dev)

{

	int pos;

	u32 status;



	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	if (!pos) {
@@ -861,23 +873,12 @@ int pci_cfg_space_size_ext(struct pci_dev *dev, unsigned check_exp_pcix) 
			goto fail;

	}



 skip:

	if (pci_read_config_dword(dev, 256, &status) != PCIBIOS_SUCCESSFUL)

		goto fail;

	if (status == 0xffffffff)

		goto fail;



	return PCI_CFG_SPACE_EXP_SIZE;

	return pci_cfg_space_size_ext(dev);



 fail:

	return PCI_CFG_SPACE_SIZE;

}



int pci_cfg_space_size(struct pci_dev *dev)

{

	return pci_cfg_space_size_ext(dev, 1);

}



static void pci_release_bus_bridge_dev(struct device *dev)

{

	kfree(dev);

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, 


void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),

		  void *userdata);

int pci_cfg_space_size_ext(struct pci_dev *dev, unsigned check_exp_pcix);

int pci_cfg_space_size_ext(struct pci_dev *dev);

int pci_cfg_space_size(struct pci_dev *dev);

unsigned char pci_bus_max_busnr(struct pci_bus *bus);