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

Commit c88c2a18 authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman
Browse files

powerpc: pcibios_enable_device_hook: return bool rather than int 



pcibios_enable_device_hook returned an int. Every implementation
returned either -EINVAL or 0. The return value wasn't propagated by
the caller: any non-zero return value caused pcibios_enable_device
to return -EINVAL itself. Therefore, make the hook return a bool.

Signed-off-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ba9c8f22

arch/powerpc/include/asm/machdep.h

+2 −2
Original line number Diff line number Diff line
@@ -237,9 +237,9 @@ struct machdep_calls { 
	/* Called for each PCI bus in the system when it's probed */

	void (*pcibios_fixup_bus)(struct pci_bus *);



	/* Called when pci_enable_device() is called. Returns 0 to

	/* Called when pci_enable_device() is called. Returns true to

	 * allow assignment/enabling of the device. */

	int  (*pcibios_enable_device_hook)(struct pci_dev *);

	bool (*pcibios_enable_device_hook)(struct pci_dev *);



	/* Called after scan and before resource survey */

	void (*pcibios_fixup_phb)(struct pci_controller *hose);

arch/powerpc/kernel/pci-common.c

+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); 
int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	if (ppc_md.pcibios_enable_device_hook)

		if (ppc_md.pcibios_enable_device_hook(dev))

		if (!ppc_md.pcibios_enable_device_hook(dev))

			return -EINVAL;



	return pci_enable_resources(dev, mask);

arch/powerpc/platforms/powermac/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ void __init pmac_pci_init(void) 
}



#ifdef CONFIG_PPC32

int pmac_pci_enable_device_hook(struct pci_dev *dev)

bool pmac_pci_enable_device_hook(struct pci_dev *dev)

{

	struct device_node* node;

	int updatecfg = 0;
@@ -958,11 +958,11 @@ int pmac_pci_enable_device_hook(struct pci_dev *dev) 
	    && !node) {

		printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n",

		       pci_name(dev));

		return -EINVAL;

		return false;

	}



	if (!node)

		return 0;

		return true;



	uninorth_child = node->parent &&

		of_device_is_compatible(node->parent, "uni-north");
@@ -1003,7 +1003,7 @@ int pmac_pci_enable_device_hook(struct pci_dev *dev) 
				      L1_CACHE_BYTES >> 2);

	}



	return 0;

	return true;

}



void pmac_pci_fixup_ohci(struct pci_dev *dev)

arch/powerpc/platforms/powermac/pmac.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ extern void pmac_pci_init(void); 
extern void pmac_nvram_update(void);

extern unsigned char pmac_nvram_read_byte(int addr);

extern void pmac_nvram_write_byte(int addr, unsigned char val);

extern int pmac_pci_enable_device_hook(struct pci_dev *dev);

extern bool pmac_pci_enable_device_hook(struct pci_dev *dev);

extern void pmac_pcibios_after_init(void);

extern int of_show_percpuinfo(struct seq_file *m, int i);

arch/powerpc/platforms/powernv/pci-ioda.c

+4 −4
Original line number Diff line number Diff line
@@ -1911,7 +1911,7 @@ static resource_size_t pnv_pci_window_alignment(struct pci_bus *bus, 
/* Prevent enabling devices for which we couldn't properly

 * assign a PE

 */

static int pnv_pci_enable_device_hook(struct pci_dev *dev)

static bool pnv_pci_enable_device_hook(struct pci_dev *dev)

{

	struct pci_controller *hose = pci_bus_to_host(dev->bus);

	struct pnv_phb *phb = hose->private_data;
@@ -1923,13 +1923,13 @@ static int pnv_pci_enable_device_hook(struct pci_dev *dev) 
	 * PEs isn't ready.

	 */

	if (!phb->initialized)

		return 0;

		return true;



	pdn = pci_get_pdn(dev);

	if (!pdn || pdn->pe_number == IODA_INVALID_PE)

		return -EINVAL;

		return false;



	return 0;

	return true;

}



static u32 pnv_ioda_bdfn_to_pe(struct pnv_phb *phb, struct pci_bus *bus,