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

Commit 9e447547 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/powernv/pci: Fix cfg_dbg() & replace with pr_devel() 



When cfg_dbg() is enabled (i.e. mapped to printk()), gcc produces
errors as the __func__ parameter is missing (pnv_pci_cfg_read() has one);
this adds the missing parameter.

cfg_dbg() is just an inferior version of pr_devel() so use the latter
instead.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2f67798c

arch/powerpc/platforms/powernv/pci.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -39,9 +39,6 @@ 
/* Delay in usec */

/* Delay in usec */

#define PCI_RESET_DELAY_US	3000000

#define PCI_RESET_DELAY_US	3000000





#define cfg_dbg(fmt...)	do { } while(0)

//#define cfg_dbg(fmt...)	printk(fmt)



#ifdef CONFIG_PCI_MSI

#ifdef CONFIG_PCI_MSI

int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

{

{
@@ -402,7 +399,7 @@ static void pnv_pci_config_check_eeh(struct pci_dn *pdn) 
		}

		}

	}

	}





	cfg_dbg(" -> EEH check, bdfn=%04x PE#%d fstate=%x\n",

	pr_devel(" -> EEH check, bdfn=%04x PE#%d fstate=%x\n",

		 (pdn->busno << 8) | (pdn->devfn), pe_no, fstate);

		 (pdn->busno << 8) | (pdn->devfn), pe_no, fstate);





	/* Clear the frozen state if applicable */

	/* Clear the frozen state if applicable */
@@ -451,7 +448,7 @@ int pnv_pci_cfg_read(struct pci_dn *pdn, 
		return PCIBIOS_FUNC_NOT_SUPPORTED;

		return PCIBIOS_FUNC_NOT_SUPPORTED;

	}

	}





	cfg_dbg("%s: bus: %x devfn: %x +%x/%x -> %08x\n",

	pr_devel("%s: bus: %x devfn: %x +%x/%x -> %08x\n",

		 __func__, pdn->busno, pdn->devfn, where, size, *val);

		 __func__, pdn->busno, pdn->devfn, where, size, *val);

	return PCIBIOS_SUCCESSFUL;

	return PCIBIOS_SUCCESSFUL;

}

}
@@ -462,8 +459,8 @@ int pnv_pci_cfg_write(struct pci_dn *pdn, 
	struct pnv_phb *phb = pdn->phb->private_data;

	struct pnv_phb *phb = pdn->phb->private_data;

	u32 bdfn = (pdn->busno << 8) | pdn->devfn;

	u32 bdfn = (pdn->busno << 8) | pdn->devfn;





	cfg_dbg("%s: bus: %x devfn: %x +%x/%x -> %08x\n",

	pr_devel("%s: bus: %x devfn: %x +%x/%x -> %08x\n",

		pdn->busno, pdn->devfn, where, size, val);

		 __func__, pdn->busno, pdn->devfn, where, size, val);

	switch (size) {

	switch (size) {

	case 1:

	case 1:

		opal_pci_config_write_byte(phb->opal_id, bdfn, where, val);

		opal_pci_config_write_byte(phb->opal_id, bdfn, where, val);