On Mon, Oct 25, 2021 at 11:56:55AM +0200, Julian Wiedmann wrote:
> From: Heiko Carstens <hca@xxxxxxxxxxxxx>
>
> Various format strings don't match with types of parameters.
> Fix all of them.
>
> Acked-by: Julian Wiedmann <jwi@xxxxxxxxxxxxx>
> Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx>
> Signed-off-by: Julian Wiedmann <jwi@xxxxxxxxxxxxx>
> ---
> drivers/s390/net/qeth_l2_main.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
> index adba52da9cab..0347fc184786 100644
> --- a/drivers/s390/net/qeth_l2_main.c
> +++ b/drivers/s390/net/qeth_l2_main.c
> @@ -661,13 +661,13 @@ static void qeth_l2_dev2br_fdb_notify(struct qeth_card *card, u8 code,
> card->dev, &info.info, NULL);
> QETH_CARD_TEXT(card, 4, "andelmac");
> QETH_CARD_TEXT_(card, 4,
> - "mc%012lx", ether_addr_to_u64(ntfy_mac));
> + "mc%012llx", ether_addr_to_u64(ntfy_mac));
> } else {
> call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,
> card->dev, &info.info, NULL);
> QETH_CARD_TEXT(card, 4, "anaddmac");
> QETH_CARD_TEXT_(card, 4,
> - "mc%012lx", ether_addr_to_u64(ntfy_mac));
> + "mc%012llx", ether_addr_to_u64(ntfy_mac));
You can print MAC addresses using the "%pM" printf format specifier, and
the ntfy_mac as argument.
> }
> }
>
> @@ -765,8 +765,8 @@ static void qeth_l2_br2dev_worker(struct work_struct *work)
> int err = 0;
>
> kfree(br2dev_event_work);
> - QETH_CARD_TEXT_(card, 4, "b2dw%04x", event);
> - QETH_CARD_TEXT_(card, 4, "ma%012lx", ether_addr_to_u64(addr));
> + QETH_CARD_TEXT_(card, 4, "b2dw%04lx", event);
> + QETH_CARD_TEXT_(card, 4, "ma%012llx", ether_addr_to_u64(addr));
>
> rcu_read_lock();
> /* Verify preconditions are still valid: */
> @@ -795,7 +795,7 @@ static void qeth_l2_br2dev_worker(struct work_struct *work)
> if (err) {
> QETH_CARD_TEXT(card, 2, "b2derris");
> QETH_CARD_TEXT_(card, 2,
> - "err%02x%03d", event,
> + "err%02lx%03d", event,
> lowerdev->ifindex);
> }
> }
> @@ -813,7 +813,7 @@ static void qeth_l2_br2dev_worker(struct work_struct *work)
> break;
> }
> if (err)
> - QETH_CARD_TEXT_(card, 2, "b2derr%02x", event);
> + QETH_CARD_TEXT_(card, 2, "b2derr%02lx", event);
> }
>
> unlock:
> @@ -878,7 +878,7 @@ static int qeth_l2_switchdev_event(struct notifier_block *unused,
> while (lowerdev) {
> if (qeth_l2_must_learn(lowerdev, dstdev)) {
> card = lowerdev->ml_priv;
> - QETH_CARD_TEXT_(card, 4, "b2dqw%03x", event);
> + QETH_CARD_TEXT_(card, 4, "b2dqw%03lx", event);
> rc = qeth_l2_br2dev_queue_work(brdev, lowerdev,
> dstdev, event,
> fdb_info->addr);
> --
> 2.25.1
>
