Commit 1c105bac authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Andrew Lunn
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Message-ID: <d9c5094c-89a6-40e2-b5fe-8df7df4624ef@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent e2015942

drivers/net/ethernet/realtek/r8169_firmware.c

+3 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int rtl_fw_request_firmware(struct rtl_fw *rtl_fw) 
{

	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_fw *rtl_fw) 


	return 0;

out:

	dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",

	dev_warn(rtl_fw->dev, "Unable to load firmware %s (%d)\n",

		 rtl_fw->fw_name, rc);

	return rc;

}