Commit ef2a95db authored by Justin Stitt's avatar Justin Stitt Committed by Jakub Kicinski
Browse files

nfp: fix clang -Wformat warnings 

When building with Clang we encounter these warnings:
| drivers/net/ethernet/netronome/nfp/nfp_app.c:233:99: error: format
| specifies type 'unsigned char' but the argument has underlying type
| 'unsigned int' [-Werror,-Wformat] nfp_err(pf->cpp, "unknown FW app ID
| 0x%02hhx, driver too old or support for FW not built in\n", id);
-
| drivers/net/ethernet/netronome/nfp/nfp_main.c:396:11: error: format
| specifies type 'unsigned char' but the argument has type 'int'
| [-Werror,-Wformat] serial, interface >> 8, interface & 0xff);

Correct format specifier for `id` is `%x` since the default type for the
`nfp_app_id` enum is `unsigned int`. The second warning is also solved
by using the `%x` format specifier as the expressions involving
`interface` are implicity promoted to integers (%x is used to maintain
hexadecimal representation).

Link: https://github.com/ClangBuiltLinux/linux/issues/378


Signed-off-by: default avatarJustin Stitt <justinstitt@google.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20220712000152.2292031-1-justinstitt@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d7d27304

drivers/net/ethernet/netronome/nfp/nfp_app.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ struct nfp_app *nfp_app_alloc(struct nfp_pf *pf, enum nfp_app_id id) 
	struct nfp_app *app;



	if (id >= ARRAY_SIZE(apps) || !apps[id]) {

		nfp_err(pf->cpp, "unknown FW app ID 0x%02hhx, driver too old or support for FW not built in\n", id);

		nfp_err(pf->cpp, "unknown FW app ID 0x%02x, driver too old or support for FW not built in\n", id);

		return ERR_PTR(-EINVAL);

	}

drivers/net/ethernet/netronome/nfp/nfp_main.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ nfp_net_fw_find(struct pci_dev *pdev, struct nfp_pf *pf) 
	/* First try to find a firmware image specific for this device */

	interface = nfp_cpp_interface(pf->cpp);

	nfp_cpp_serial(pf->cpp, &serial);

	sprintf(fw_name, "netronome/serial-%pMF-%02hhx-%02hhx.nffw",

	sprintf(fw_name, "netronome/serial-%pMF-%02x-%02x.nffw",

		serial, interface >> 8, interface & 0xff);

	fw = nfp_net_fw_request(pdev, pf, fw_name);

	if (fw)