git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 1c105bacb160b5918e917ab811552b7be69fc69c Mon Sep 17 00:00:00 2001
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Wed, 16 Oct 2024 22:29:39 +0200
   4 Subject: [PATCH] r8169: avoid duplicated messages if loading firmware fails
   5  and switch to warn level
   6
   7 In case of a problem with firmware loading we inform at the driver level,
   8 in addition the firmware load code itself issues warnings. Therefore
   9 switch to firmware_request_nowarn() to avoid duplicated error messages.
  10 In addition switch to warn level because the firmware is optional and
  11 typically just fixes compatibility issues.
  12
  13 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  14 Reviewed-by: Simon Horman <horms@kernel.org>
  15 Message-ID: <d9c5094c-89a6-40e2-b5fe-8df7df4624ef@gmail.com>
  16 Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  17 ---
  18  drivers/net/ethernet/realtek/r8169_firmware.c | 6 +++---
  19  1 file changed, 3 insertions(+), 3 deletions(-)
  20
  21 --- a/drivers/net/ethernet/realtek/r8169_firmware.c
  22 +++ b/drivers/net/ethernet/realtek/r8169_firmware.c
  23 @@ -215,7 +215,7 @@ int rtl_fw_request_firmware(struct rtl_f
  24  {
  25         int rc;
  26
  27 -       rc = request_firmware(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
  28 +       rc = firmware_request_nowarn(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
  29         if (rc < 0)
  30                 goto out;
  31
  32 @@ -227,7 +227,7 @@ int rtl_fw_request_firmware(struct rtl_f
  33
  34         return 0;
  35  out:
  36 -       dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
  37 -               rtl_fw->fw_name, rc);
  38 +       dev_warn(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
  39 +                rtl_fw->fw_name, rc);
  40         return rc;
  41  }