mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-25 13:49:26 +00:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From 1c105bacb160b5918e917ab811552b7be69fc69c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||
|
|
Date: Wed, 16 Oct 2024 22:29:39 +0200
|
||
|
|
Subject: [PATCH] r8169: avoid duplicated messages if loading firmware fails
|
||
|
|
and switch to warn level
|
||
|
|
|
||
|
|
In case of a problem with firmware loading we inform at the driver level,
|
||
|
|
in addition the firmware load code itself issues warnings. Therefore
|
||
|
|
switch to firmware_request_nowarn() to avoid duplicated error messages.
|
||
|
|
In addition switch to warn level because the firmware is optional and
|
||
|
|
typically just fixes compatibility issues.
|
||
|
|
|
||
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
||
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
||
|
|
Message-ID: <d9c5094c-89a6-40e2-b5fe-8df7df4624ef@gmail.com>
|
||
|
|
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/realtek/r8169_firmware.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/realtek/r8169_firmware.c
|
||
|
|
+++ b/drivers/net/ethernet/realtek/r8169_firmware.c
|
||
|
|
@@ -215,7 +215,7 @@ int rtl_fw_request_firmware(struct rtl_f
|
||
|
|
{
|
||
|
|
int rc;
|
||
|
|
|
||
|
|
- rc = request_firmware(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
|
||
|
|
+ rc = firmware_request_nowarn(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
|
||
|
|
if (rc < 0)
|
||
|
|
goto out;
|
||
|
|
|
||
|
|
@@ -227,7 +227,7 @@ int rtl_fw_request_firmware(struct rtl_f
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
out:
|
||
|
|
- dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
|
||
|
|
- rtl_fw->fw_name, rc);
|
||
|
|
+ dev_warn(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
|
||
|
|
+ rtl_fw->fw_name, rc);
|
||
|
|
return rc;
|
||
|
|
}
|