Commit f65f6186 authored by Ben Hutchings's avatar Ben Hutchings

rtl8192se: Fix warning introduced by "firmware: Remove redundant log messages from drivers"

The firmware file name is a local variable in both functions that
use it, and rtl92se_fw_cb() only uses it for the logging that we
remove.
parent a5394cbc
......@@ -17,6 +17,8 @@ linux (4.17~rc4-1~exp1) UNRELEASED; urgency=medium
* Reclassify lockdep packages as unversioned tools
* [hppa/parisc64-smp] IB: Fix RDMA_RXE and INFINIBAND_RDMAVT dependencies for
DMA_VIRT_OPS
* rtl8192se: Fix warning introduced by "firmware: Remove redundant log
messages from drivers"
-- Luca Boccassi <bluca@debian.org> Wed, 02 May 2018 12:59:01 +0100
......@@ -285,7 +285,7 @@ upstream submission.
ret = qib_ibsd_ucode_loaded(dd->pport, fw);
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2724,10 +2724,8 @@ static int mxt_load_fw(struct device *de
@@ -2758,10 +2758,8 @@ static int mxt_load_fw(struct device *de
int ret;
ret = request_firmware(&fw, fn, dev);
......@@ -1674,7 +1674,13 @@ upstream submission.
}
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
@@ -92,7 +92,6 @@ static void rtl92se_fw_cb(const struct f
@@ -86,13 +86,11 @@ static void rtl92se_fw_cb(const struct f
struct ieee80211_hw *hw = context;
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rt_firmware *pfirmware = NULL;
- char *fw_name = "rtlwifi/rtl8192sefw.bin";
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
"Firmware callback routine entered!\n");
complete(&rtlpriv->firmware_loading_complete);
if (!firmware) {
......@@ -2448,7 +2454,7 @@ upstream submission.
snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1970,10 +1970,8 @@ static void azx_firmware_cb(const struct
@@ -1971,10 +1971,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment