Commit e7513ecc authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Thomas Bogendoerfer
Browse files

MIPS: TXx9: Do PCI error checks on own line 



Instead of if conditions with line splits, use the usual error handling
pattern with a separate variable to improve readability.

The second check can use reverse logic which reduces indentation level.

No functional changes intended.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent d913ff56

arch/mips/txx9/generic/pci.c

+23 −20
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ int __init txx9_pci66_check(struct pci_controller *hose, int top_bus, 
	unsigned short vid;

	int cap66 = -1;

	u16 stat;

	int ret;



	/* It seems SLC90E66 needs some time after PCI reset... */

	mdelay(80);
@@ -60,9 +61,9 @@ int __init txx9_pci66_check(struct pci_controller *hose, int top_bus, 
	for (pci_devfn = 0; pci_devfn < 0xff; pci_devfn++) {

		if (PCI_FUNC(pci_devfn))

			continue;

		if (early_read_config_word(hose, top_bus, current_bus,

					   pci_devfn, PCI_VENDOR_ID, &vid) !=

		    PCIBIOS_SUCCESSFUL)

		ret = early_read_config_word(hose, top_bus, current_bus,

					     pci_devfn, PCI_VENDOR_ID, &vid);

		if (ret != PCIBIOS_SUCCESSFUL)

			continue;

		if (vid == 0xffff)

			continue;
@@ -343,12 +344,15 @@ static void tc35815_fixup(struct pci_dev *dev) 


static void final_fixup(struct pci_dev *dev)

{

	unsigned long timeout;

	unsigned char bist;

	int ret;



	/* Do build-in self test */

	if (pci_read_config_byte(dev, PCI_BIST, &bist) == PCIBIOS_SUCCESSFUL &&

	    (bist & PCI_BIST_CAPABLE)) {

		unsigned long timeout;

	ret = pci_read_config_byte(dev, PCI_BIST, &bist);

	if ((ret != PCIBIOS_SUCCESSFUL) || !(bist & PCI_BIST_CAPABLE))

		return;



	pci_set_power_state(dev, PCI_D0);

	pr_info("PCI: %s BIST...", pci_name(dev));

	pci_write_config_byte(dev, PCI_BIST, PCI_BIST_START);
@@ -363,7 +367,6 @@ static void final_fixup(struct pci_dev *dev) 
	else

		pr_cont("OK.\n");

}

}



#ifdef CONFIG_TOSHIBA_FPCIB0

#define PCI_DEVICE_ID_EFAR_SLC90E66_0 0x9460