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

Commit 27991c78 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

soc: ixp4xx: fix printing resources 



commit 8861452b2097bb0b5d0081a1c137fb3870b0a31f upstream.

When compile-testing with 64-bit resource_size_t, gcc reports an invalid
printk format string:

In file included from include/linux/dma-mapping.h:7,
                 from drivers/soc/ixp4xx/ixp4xx-npe.c:15:
drivers/soc/ixp4xx/ixp4xx-npe.c: In function 'ixp4xx_npe_probe':
drivers/soc/ixp4xx/ixp4xx-npe.c:694:18: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
    dev_info(dev, "NPE%d at 0x%08x-0x%08x not available\n",

Use the special %pR format string to print the resources.

Fixes: 0b458d7b ("soc: ixp4xx: npe: Pass addresses as resources")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07fd256d

drivers/soc/ixp4xx/ixp4xx-npe.c

+5 −6
Original line number Diff line number Diff line
@@ -690,8 +690,8 @@ static int ixp4xx_npe_probe(struct platform_device *pdev) 


		if (!(ixp4xx_read_feature_bits() &

		      (IXP4XX_FEATURE_RESET_NPEA << i))) {

			dev_info(dev, "NPE%d at 0x%08x-0x%08x not available\n",

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

			dev_info(dev, "NPE%d at %pR not available\n",

				 i, res);

			continue; /* NPE already disabled or not present */

		}

		npe->regs = devm_ioremap_resource(dev, res);
@@ -699,13 +699,12 @@ static int ixp4xx_npe_probe(struct platform_device *pdev) 
			return PTR_ERR(npe->regs);



		if (npe_reset(npe)) {

			dev_info(dev, "NPE%d at 0x%08x-0x%08x does not reset\n",

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

			dev_info(dev, "NPE%d at %pR does not reset\n",

				 i, res);

			continue;

		}

		npe->valid = 1;

		dev_info(dev, "NPE%d at 0x%08x-0x%08x registered\n",

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

		dev_info(dev, "NPE%d at %pR registered\n", i, res);

		found++;

	}