Commit 59510820 authored by Randy Dunlap's avatar Randy Dunlap Committed by Michael Ellerman
Browse files

powerpc/mpc52xx: Fix some pr_debug() issues 



Fix some pr_debug() issues in mpc52xx_pci.c:

- use __func__ to print function names
- use "%pr" to print struct resource entries
- use "%pa" to print a resource_size_t (phys_addr_t)

The latter two fix several build warnings:

  ../arch/powerpc/platforms/52xx/mpc52xx_pci.c: In function 'mpc52xx_pci_setup':
  ../include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Wformat=]
  ../arch/powerpc/platforms/52xx/mpc52xx_pci.c:277:40: note: format string is defined here
    277 |   pr_debug("mem_resource[1] = {.start=%x, .end=%x, .flags=%lx}\n",
        |                                       ~^
        |                                        |
        |                                        unsigned int
        |                                       %llx
  ../include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'resource_size_t' {aka 'long long unsigned int'} [-Wformat=]
  ../arch/powerpc/platforms/52xx/mpc52xx_pci.c:277:49: note: format string is defined here
    277 |   pr_debug("mem_resource[1] = {.start=%x, .end=%x, .flags=%lx}\n",
        |                                                ~^
        |                                                 |
        |                                                 unsigned int
        |                                                %llx

  ../arch/powerpc/platforms/52xx/mpc52xx_pci.c:299:36: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
    299 |    (unsigned long long)res->flags, (void*)hose->io_base_phys);
        |                                    ^
  ../arch/powerpc/platforms/52xx/mpc52xx_pci.c:295:2: note: in expansion of macro 'pr_debug'
    295 |  pr_debug(".io_resource={.start=%llx,.end=%llx,.flags=%llx} "
        |  ^~~~~~~~

The change to print mem_resource[0] is for consistency within this
source file and to use the kernel API -- there were no warnings here.

Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
[chleroy: Fixed checkpatch complaints]
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210429005323.8195-1-rdunlap@infradead.org
parent d5f14dcf

arch/powerpc/platforms/52xx/mpc52xx_pci.c

+6 −15
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ mpc52xx_pci_setup(struct pci_controller *hose, 
	u32 tmp;

	int iwcr0 = 0, iwcr1 = 0, iwcr2 = 0;



	pr_debug("mpc52xx_pci_setup(hose=%p, pci_regs=%p)\n", hose, pci_regs);

	pr_debug("%s(hose=%p, pci_regs=%p)\n", __func__, hose, pci_regs);



	/* pci_process_bridge_OF_ranges() found all our addresses for us;

	 * now store them in the right places */
@@ -257,11 +257,7 @@ mpc52xx_pci_setup(struct pci_controller *hose, 
	/* Memory windows */

	res = &hose->mem_resources[0];

	if (res->flags) {

		pr_debug("mem_resource[0] = "

		         "{.start=%llx, .end=%llx, .flags=%llx}\n",

		         (unsigned long long)res->start,

			 (unsigned long long)res->end,

			 (unsigned long long)res->flags);

		pr_debug("mem_resource[0] = %pr\n", res);

		out_be32(&pci_regs->iw0btar,

		         MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,

							resource_size(res)));
@@ -274,8 +270,7 @@ mpc52xx_pci_setup(struct pci_controller *hose, 


	res = &hose->mem_resources[1];

	if (res->flags) {

		pr_debug("mem_resource[1] = {.start=%x, .end=%x, .flags=%lx}\n",

		         res->start, res->end, res->flags);

		pr_debug("mem_resource[1] = %pr\n", res);

		out_be32(&pci_regs->iw1btar,

		         MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,

							resource_size(res)));
@@ -292,11 +287,8 @@ mpc52xx_pci_setup(struct pci_controller *hose, 
		printk(KERN_ERR "%s: Didn't find IO resources\n", __FILE__);

		return;

	}

	pr_debug(".io_resource={.start=%llx,.end=%llx,.flags=%llx} "

	         ".io_base_phys=0x%p\n",

	         (unsigned long long)res->start,

		 (unsigned long long)res->end,

		 (unsigned long long)res->flags, (void*)hose->io_base_phys);

	pr_debug(".io_resource = %pr .io_base_phys=0x%pa\n",

		 res, &hose->io_base_phys);

	out_be32(&pci_regs->iw2btar,

	         MPC52xx_PCI_IWBTAR_TRANSLATION(hose->io_base_phys,

	                                        res->start,
@@ -336,8 +328,7 @@ mpc52xx_pci_fixup_resources(struct pci_dev *dev) 
{

	int i;



	pr_debug("mpc52xx_pci_fixup_resources() %.4x:%.4x\n",

	         dev->vendor, dev->device);

	pr_debug("%s() %.4x:%.4x\n", __func__, dev->vendor, dev->device);



	/* We don't rely on boot loader for PCI and resets all

	   devices */