From 1bd9a13886911cd0eb72ca541818c0a37b8d25a7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 9 Dec 2012 16:40:31 +0000 Subject: [PATCH] firmware: Remove redundant log messages from drivers Now that firmware_class logs every success and failure consistently, many other log messages can be removed from drivers. This will probably need to be split up into multiple patches prior to upstream submission. Gbp-Pq: Topic bugfix/all Gbp-Pq: Name firmware-remove-redundant-log-messages-from-drivers.patch --- arch/arm/mach-netx/xc.c | 4 +-- arch/x86/kernel/cpu/microcode/amd.c | 4 +-- drivers/atm/ambassador.c | 4 +-- drivers/atm/fore200e.c | 5 ++-- drivers/bluetooth/ath3k.c | 8 ++---- drivers/bluetooth/bcm203x.c | 2 -- drivers/bluetooth/bfusb.c | 4 +-- drivers/bluetooth/bt3c_cs.c | 4 +-- drivers/bluetooth/btmrvl_sdio.c | 4 --- drivers/char/dsp56k.c | 5 +--- drivers/dma/imx-sdma.c | 5 +--- drivers/gpu/drm/mga/mga_warp.c | 5 +--- .../gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 4 +-- drivers/gpu/drm/r128/r128_cce.c | 5 +--- drivers/gpu/drm/radeon/ni.c | 3 -- drivers/gpu/drm/radeon/r100.c | 4 +-- drivers/gpu/drm/radeon/r600.c | 3 -- drivers/infiniband/hw/qib/qib_sd7220.c | 4 +-- drivers/input/touchscreen/atmel_mxt_ts.c | 4 +-- drivers/isdn/hardware/mISDN/speedfax.c | 5 +--- drivers/media/common/siano/smscoreapi.c | 4 +-- drivers/media/dvb-frontends/af9013.c | 8 +----- drivers/media/dvb-frontends/bcm3510.c | 5 ++-- drivers/media/dvb-frontends/cx24116.c | 7 +---- drivers/media/dvb-frontends/drxd_hard.c | 4 +-- drivers/media/dvb-frontends/drxk_hard.c | 4 --- drivers/media/dvb-frontends/ds3000.c | 6 +--- drivers/media/dvb-frontends/nxt200x.c | 12 ++------ drivers/media/dvb-frontends/or51132.c | 4 +-- drivers/media/dvb-frontends/or51211.c | 5 +--- drivers/media/dvb-frontends/sp8870.c | 4 +-- drivers/media/dvb-frontends/sp887x.c | 4 +-- drivers/media/dvb-frontends/tda10048.c | 2 -- drivers/media/dvb-frontends/tda1004x.c | 5 +--- drivers/media/dvb-frontends/tda10071.c | 6 +--- drivers/media/i2c/cx25840/cx25840-firmware.c | 4 +-- drivers/media/pci/bt8xx/bttv-cards.c | 4 +-- drivers/media/pci/cx18/cx18-av-firmware.c | 4 +-- drivers/media/pci/cx18/cx18-dvb.c | 4 +-- drivers/media/pci/cx18/cx18-firmware.c | 7 +---- drivers/media/pci/cx23885/cx23885-417.c | 6 +--- drivers/media/pci/cx23885/cx23885-cards.c | 5 +--- drivers/media/pci/cx88/cx88-blackbird.c | 6 +--- drivers/media/pci/ivtv/ivtv-firmware.c | 2 -- drivers/media/pci/ngene/ngene-core.c | 7 +---- drivers/media/pci/saa7164/saa7164-fw.c | 5 +--- drivers/media/pci/ttpci/av7110.c | 9 ++---- drivers/media/pci/ttpci/av7110_hw.c | 5 +--- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 +-- drivers/media/radio/radio-wl1273.c | 5 +--- drivers/media/radio/wl128x/fmdrv_common.c | 4 +-- drivers/media/tuners/tuner-xc2028.c | 1 - drivers/media/usb/cpia2/cpia2_core.c | 5 +--- drivers/media/usb/cx231xx/cx231xx-417.c | 5 ---- drivers/media/usb/dvb-usb/dib0700_devices.c | 14 +++------- drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 8 ++---- drivers/media/usb/dvb-usb/gp8psk.c | 7 +---- drivers/media/usb/dvb-usb/opera1.c | 2 -- drivers/media/usb/go7007/go7007-driver.c | 4 +-- drivers/media/usb/go7007/go7007-fw.c | 6 +--- drivers/media/usb/go7007/go7007-loader.c | 10 ++----- drivers/media/usb/gspca/vicam.c | 4 +-- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 19 ------------- drivers/media/usb/s2255/s2255drv.c | 4 +-- .../media/usb/ttusb-budget/dvb-ttusb-budget.c | 4 +-- drivers/media/usb/ttusb-dec/ttusb_dec.c | 5 +--- drivers/misc/ti-st/st_kim.c | 5 +--- drivers/net/can/softing/softing_fw.c | 5 +--- drivers/net/ethernet/3com/typhoon.c | 5 +--- drivers/net/ethernet/adaptec/starfire.c | 10 ++----- drivers/net/ethernet/alacritech/slicoss.c | 9 ++---- drivers/net/ethernet/alteon/acenic.c | 5 +--- drivers/net/ethernet/broadcom/bnx2.c | 9 ++---- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 5 +--- drivers/net/ethernet/broadcom/tg3.c | 5 +--- drivers/net/ethernet/brocade/bna/cna_fwimg.c | 4 +-- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 16 ++--------- drivers/net/ethernet/intel/e100.c | 3 -- .../net/ethernet/myricom/myri10ge/myri10ge.c | 2 -- drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +-- drivers/net/ethernet/sun/cassini.c | 5 +--- drivers/net/hamradio/yam.c | 5 +--- drivers/net/usb/kaweth.c | 4 +-- drivers/net/wimax/i2400m/fw.c | 7 +---- drivers/net/wireless/ath/ath9k/hif_usb.c | 3 -- drivers/net/wireless/ath/carl9170/usb.c | 1 - drivers/net/wireless/atmel/at76c50x-usb.c | 7 +---- drivers/net/wireless/atmel/atmel.c | 6 +--- drivers/net/wireless/broadcom/b43/main.c | 13 +-------- .../net/wireless/broadcom/b43legacy/main.c | 5 +--- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 10 ++----- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +--- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 4 +-- .../net/wireless/intel/iwlegacy/3945-mac.c | 1 - drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 -- drivers/net/wireless/intersil/orinoco/fw.c | 9 ++---- .../wireless/intersil/orinoco/orinoco_usb.c | 1 - drivers/net/wireless/intersil/p54/p54pci.c | 1 - drivers/net/wireless/intersil/p54/p54spi.c | 4 +-- drivers/net/wireless/intersil/p54/p54usb.c | 1 - .../wireless/intersil/prism54/islpci_dev.c | 7 ++--- .../net/wireless/marvell/libertas_tf/if_usb.c | 2 -- drivers/net/wireless/marvell/mwifiex/main.c | 5 +--- drivers/net/wireless/marvell/mwl8k.c | 15 ++-------- .../wireless/ralink/rt2x00/rt2x00firmware.c | 4 +-- drivers/net/wireless/realtek/rtlwifi/core.c | 1 - .../wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 -- drivers/net/wireless/ti/wl1251/main.c | 8 ++---- drivers/net/wireless/ti/wlcore/main.c | 4 +-- drivers/net/wireless/zydas/zd1201.c | 2 -- drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 9 +----- drivers/scsi/advansys.c | 8 ------ drivers/scsi/aic94xx/aic94xx_init.c | 2 -- drivers/scsi/aic94xx/aic94xx_seq.c | 5 +--- drivers/scsi/bfa/bfad.c | 1 - drivers/scsi/ipr.c | 4 +-- drivers/scsi/pm8001/pm8001_ctl.c | 4 --- drivers/scsi/qla1280.c | 2 -- drivers/scsi/qla2xxx/qla_init.c | 7 ----- drivers/scsi/qla2xxx/qla_nx.c | 5 +--- drivers/scsi/qla2xxx/qla_os.c | 2 -- drivers/scsi/qlogicpti.c | 5 +--- drivers/staging/rtl8192u/r819xU_firmware.c | 4 +-- drivers/staging/rtl8712/hal_init.c | 2 -- drivers/staging/vt6656/firmware.c | 7 ++--- drivers/tty/cyclades.c | 4 +-- drivers/tty/moxa.c | 7 +---- drivers/tty/serial/icom.c | 3 -- drivers/tty/serial/ucc_uart.c | 4 +-- drivers/usb/atm/cxacru.c | 2 -- drivers/usb/atm/ueagle-atm.c | 28 +++---------------- drivers/usb/misc/emi26.c | 10 ++----- drivers/usb/misc/ezusb.c | 6 +--- drivers/usb/misc/isight_firmware.c | 1 - drivers/usb/serial/io_edgeport.c | 5 +--- drivers/usb/serial/io_ti.c | 2 -- drivers/usb/serial/ti_usb_3410_5052.c | 4 +-- drivers/video/fbdev/broadsheetfb.c | 4 +-- drivers/video/fbdev/metronomefb.c | 4 +-- sound/drivers/vx/vx_hwdep.c | 4 +-- sound/isa/msnd/msnd_pinnacle.c | 8 ++---- sound/isa/sscape.c | 9 ++---- sound/isa/wavefront/wavefront_synth.c | 4 +-- sound/pci/asihpi/hpidspcd.c | 2 -- sound/pci/cs46xx/cs46xx_lib.c | 5 +--- sound/pci/echoaudio/echoaudio.c | 5 +--- sound/pci/emu10k1/emu10k1_main.c | 4 +-- sound/pci/hda/hda_intel.c | 4 +-- sound/pci/korg1212/korg1212.c | 1 - sound/pci/mixart/mixart_hwdep.c | 5 +--- sound/pci/pcxhr/pcxhr_hwdep.c | 6 +--- sound/pci/riptide/riptide.c | 5 +--- sound/pci/rme9652/hdsp.c | 5 +--- sound/soc/codecs/wm2000.c | 4 +-- sound/usb/6fire/firmware.c | 4 --- 155 files changed, 146 insertions(+), 657 deletions(-) diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index 885a618b265..d9ba13b02bb 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c @@ -115,10 +115,8 @@ int xc_request_firmware(struct xc *x) ret = request_firmware(&fw, name, x->dev); - if (ret < 0) { - dev_err(x->dev, "request_firmware failed\n"); + if (ret) return ret; - } head = (struct fw_header *)fw->data; if (head->magic != 0x4e657458) { diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 4ddadf672ab..d861ef3dcbe 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -901,10 +901,8 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, if (c->x86 >= 0x15) snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86); - if (request_firmware_direct(&fw, (const char *)fw_name, device)) { - pr_debug("failed to load file %s\n", fw_name); + if (request_firmware_direct(&fw, (const char *)fw_name, device)) goto out; - } ret = UCODE_ERROR; if (!verify_container(fw->data, fw->size, false)) diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index c039b8a4fef..e28b965059c 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -1914,10 +1914,8 @@ static int ucode_init(loader_block *lb, amb_dev *dev) int res; res = request_ihex_firmware(&fw, "atmsar11.fw", &dev->pci_dev->dev); - if (res) { - PRINTK (KERN_ERR, "Cannot load microcode data"); + if (res) return res; - } /* First record contains just the start address */ rec = (const struct ihex_binrec *)fw->data; diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index f1a50020531..003d41f1e1e 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -2414,10 +2414,9 @@ static int fore200e_load_and_start_fw(struct fore200e *fore200e) int err; sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT); - if ((err = request_firmware(&firmware, buf, fore200e->dev)) < 0) { - printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name); + err = request_firmware(&firmware, buf, fore200e->dev); + if (err) return err; - } fw_data = (const __le32 *)firmware->data; fw_size = firmware->size / sizeof(u32); diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 4ce27051369..a2945781827 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -417,10 +417,8 @@ static int ath3k_load_patch(struct usb_device *udev) le32_to_cpu(fw_version.rom_version)); ret = request_firmware(&firmware, filename, &udev->dev); - if (ret < 0) { - BT_ERR("Patch file not found %s", filename); + if (ret) return ret; - } pt_rom_version = get_unaligned_le32(firmware->data + firmware->size - 8); @@ -480,10 +478,8 @@ static int ath3k_load_syscfg(struct usb_device *udev) le32_to_cpu(fw_version.rom_version), clk_value, ".dfu"); ret = request_firmware(&firmware, filename, &udev->dev); - if (ret < 0) { - BT_ERR("Configuration file not found %s", filename); + if (ret) return ret; - } ret = ath3k_load_fwfile(udev, firmware); release_firmware(firmware); diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c index 3b176257b99..9f70b258891 100644 --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c @@ -174,7 +174,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id return -ENOMEM; if (request_firmware(&firmware, "BCM2033-MD.hex", &udev->dev) < 0) { - BT_ERR("Mini driver request failed"); usb_free_urb(data->urb); return -EIO; } @@ -199,7 +198,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id release_firmware(firmware); if (request_firmware(&firmware, "BCM2033-FW.bin", &udev->dev) < 0) { - BT_ERR("Firmware request failed"); usb_free_urb(data->urb); kfree(data->buffer); return -EIO; diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 0e5954cac98..970d414f332 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -637,10 +637,8 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i skb_queue_head_init(&data->pending_q); skb_queue_head_init(&data->completed_q); - if (request_firmware(&firmware, "bfubase.frm", &udev->dev) < 0) { - BT_ERR("Firmware request failed"); + if (request_firmware(&firmware, "bfubase.frm", &udev->dev)) goto done; - } BT_DBG("firmware data %p size %zu", firmware->data, firmware->size); diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 54713833951..341ed2d9be1 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -569,10 +569,8 @@ static int bt3c_open(struct bt3c_info *info) /* Load firmware */ err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev); - if (err < 0) { - BT_ERR("Firmware request failed"); + if (err) goto error; - } err = bt3c_load_firmware(info, firmware->data, firmware->size); diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 0f3a020703a..eef4e6a956c 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -526,8 +526,6 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card) ret = request_firmware(&fw_helper, card->helper, &card->func->dev); if ((ret < 0) || !fw_helper) { - BT_ERR("request_firmware(helper) failed, error code = %d", - ret); ret = -ENOENT; goto done; } @@ -626,8 +624,6 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card) ret = request_firmware(&fw_firmware, card->firmware, &card->func->dev); if ((ret < 0) || !fw_firmware) { - BT_ERR("request_firmware(firmware) failed, error code = %d", - ret); ret = -ENOENT; goto done; } diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index 06749e295ad..27cd3e4121a 100644 --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c @@ -140,11 +140,8 @@ static int dsp56k_upload(u_char __user *bin, int len) } err = request_firmware(&fw, fw_name, &pdev->dev); platform_device_unregister(pdev); - if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fw_name, err); + if (err) return err; - } if (fw->size % 3) { printk(KERN_ERR "Bogus length %d in image \"%s\"\n", fw->size, fw_name); diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 4ec84a633bd..2a1127fb22d 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1719,11 +1719,8 @@ static void sdma_load_firmware(const struct firmware *fw, void *context) const struct sdma_script_start_addrs *addr; unsigned short *ram_code; - if (!fw) { - dev_info(sdma->dev, "external firmware not found, using ROM firmware\n"); - /* In this case we just use the ROM firmware. */ + if (!fw) return; - } if (fw->size < sizeof(*header)) goto err_firmware; diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c index 0b76352260a..06953a71152 100644 --- a/drivers/gpu/drm/mga/mga_warp.c +++ b/drivers/gpu/drm/mga/mga_warp.c @@ -79,11 +79,8 @@ int mga_warp_install_microcode(drm_mga_private_t *dev_priv) } rc = request_ihex_firmware(&fw, firmware_name, &pdev->dev); platform_device_unregister(pdev); - if (rc) { - DRM_ERROR("mga: Failed to load microcode \"%s\"\n", - firmware_name); + if (rc) return rc; - } size = 0; where = 0; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index c578deb5867..a40536f1392 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -2099,10 +2099,8 @@ gf100_gr_ctor_fw_legacy(struct gf100_gr *gr, const char *fwname, if (ret) { snprintf(f, sizeof(f), "nouveau/%s", fwname); ret = request_firmware(&fw, f, device->dev); - if (ret) { - nvkm_error(subdev, "failed to load %s\n", fwname); + if (ret) return ret; - } } fuc->size = fw->size; diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index b91af1bf531..4fb43669152 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c @@ -154,11 +154,8 @@ static int r128_cce_load_microcode(drm_r128_private_t *dev_priv) } rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); platform_device_unregister(pdev); - if (rc) { - pr_err("r128_cce: Failed to load firmware \"%s\"\n", - FIRMWARE_NAME); + if (rc) return rc; - } if (fw->size != 256 * 8) { pr_err("r128_cce: Bogus length %zu in firmware \"%s\"\n", diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 381b0255ff0..d80224706d3 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -830,9 +830,6 @@ int ni_init_microcode(struct radeon_device *rdev) out: if (err) { - if (err != -EINVAL) - pr_err("ni_cp: Failed to load firmware \"%s\"\n", - fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 7d39ed63e5b..ec5ea1a490c 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1041,9 +1041,7 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) } err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); - if (err) { - pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name); - } else if (rdev->me_fw->size % 8) { + if (err == 0 && rdev->me_fw->size % 8) { pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); err = -EINVAL; diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index e06e2d8feab..0c5220080dd 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2593,9 +2593,6 @@ int r600_init_microcode(struct radeon_device *rdev) out: if (err) { - if (err != -EINVAL) - pr_err("r600_cp: Failed to load firmware \"%s\"\n", - fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c index 4f4a09c2dbc..7bf90abe699 100644 --- a/drivers/infiniband/hw/qib/qib_sd7220.c +++ b/drivers/infiniband/hw/qib/qib_sd7220.c @@ -406,10 +406,8 @@ int qib_sd7220_init(struct qib_devdata *dd) } ret = request_firmware(&fw, SD7220_FW_NAME, &dd->pcidev->dev); - if (ret) { - qib_dev_err(dd, "Failed to load IB SERDES image\n"); + if (ret) goto done; - } /* Substitute our deduced value for was_reset */ ret = qib_ibsd_ucode_loaded(dd->pport, fw); diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 19378f200c6..030883c17ce 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -2777,10 +2777,8 @@ static int mxt_load_fw(struct device *dev, const char *fn) int ret; ret = request_firmware(&fw, fn, dev); - if (ret) { - dev_err(dev, "Unable to open firmware %s\n", fn); + if (ret) return ret; - } /* Check for incorrect enc file */ ret = mxt_check_firmware_format(dev, fw); diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c index b530c78eca8..a336db7a813 100644 --- a/drivers/isdn/hardware/mISDN/speedfax.c +++ b/drivers/isdn/hardware/mISDN/speedfax.c @@ -379,11 +379,8 @@ setup_instance(struct sfax_hw *card) card->isar.owner = THIS_MODULE; err = request_firmware(&firmware, "isdn/ISAR.BIN", &card->pdev->dev); - if (err < 0) { - pr_info("%s: firmware request failed %d\n", - card->name, err); + if (err) goto error_fw; - } if (debug & DEBUG_HW) pr_notice("%s: got firmware %zu bytes\n", card->name, firmware->size); diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c index 0ba51dacc58..a48e0d2cbd3 100644 --- a/drivers/media/common/siano/smscoreapi.c +++ b/drivers/media/common/siano/smscoreapi.c @@ -1156,10 +1156,8 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev, return -EINVAL; rc = request_firmware(&fw, fw_filename, coredev->device); - if (rc < 0) { - pr_err("failed to open firmware file '%s'\n", fw_filename); + if (rc < 0) return rc; - } pr_debug("read fw %s, buffer size=0x%zx\n", fw_filename, fw->size); fw_buf = kmalloc(ALIGN(fw->size + sizeof(struct sms_firmware), SMS_ALLOC_ALIGNMENT), GFP_KERNEL | coredev->gfp_buf_flags); diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c index 7281899bd7a..a1ddafb4f21 100644 --- a/drivers/media/dvb-frontends/af9013.c +++ b/drivers/media/dvb-frontends/af9013.c @@ -1049,14 +1049,8 @@ static int af9013_download_firmware(struct af9013_state *state) /* Request the firmware, will block and timeout */ ret = request_firmware(&firmware, name, &client->dev); - if (ret) { - dev_info(&client->dev, "firmware file '%s' not found %d\n", - name, ret); + if (ret) goto err; - } - - dev_info(&client->dev, "downloading firmware from file '%s'\n", - name); /* Write firmware checksum & size */ for (i = 0; i < firmware->size; i++) diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c index e92542b92d3..cd10feb1f88 100644 --- a/drivers/media/dvb-frontends/bcm3510.c +++ b/drivers/media/dvb-frontends/bcm3510.c @@ -636,10 +636,9 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe) int ret,i; deb_info("requesting firmware\n"); - if ((ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE)) < 0) { - err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret); + ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE); + if (ret) return ret; - } deb_info("got firmware: %zu\n", fw->size); b = fw->data; diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c index ea8264ccbb4..becc7dc6847 100644 --- a/drivers/media/dvb-frontends/cx24116.c +++ b/drivers/media/dvb-frontends/cx24116.c @@ -479,13 +479,8 @@ static int cx24116_firmware_ondemand(struct dvb_frontend *fe) __func__, CX24116_DEFAULT_FIRMWARE); ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE, state->i2c->dev.parent); - printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n", - __func__); - if (ret) { - printk(KERN_ERR "%s: No firmware uploaded (timeout or file not found?)\n", - __func__); + if (ret) return ret; - } /* Make sure we don't recurse back through here * during loading */ diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c index fae6f376336..751e240bad9 100644 --- a/drivers/media/dvb-frontends/drxd_hard.c +++ b/drivers/media/dvb-frontends/drxd_hard.c @@ -891,10 +891,8 @@ static int load_firmware(struct drxd_state *state, const char *fw_name) { const struct firmware *fw; - if (request_firmware(&fw, fw_name, state->dev) < 0) { - printk(KERN_ERR "drxd: firmware load failure [%s]\n", fw_name); + if (request_firmware(&fw, fw_name, state->dev)) return -EIO; - } state->microcode = kmemdup(fw->data, fw->size, GFP_KERNEL); if (!state->microcode) { diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 0a4875b391d..8d21a2cdff6 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c @@ -6271,10 +6271,6 @@ static void load_firmware_cb(const struct firmware *fw, dprintk(1, ": %s\n", fw ? "firmware loaded" : "firmware not loaded"); if (!fw) { - pr_err("Could not load firmware file %s.\n", - state->microcode_name); - pr_info("Copy %s to your hotplug directory!\n", - state->microcode_name); state->microcode_name = NULL; /* diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c index 20fcf31af16..d8008d58285 100644 --- a/drivers/media/dvb-frontends/ds3000.c +++ b/drivers/media/dvb-frontends/ds3000.c @@ -348,12 +348,8 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) DS3000_DEFAULT_FIRMWARE); ret = request_firmware(&fw, DS3000_DEFAULT_FIRMWARE, state->i2c->dev.parent); - printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n", __func__); - if (ret) { - printk(KERN_ERR "%s: No firmware uploaded (timeout or file not found?)\n", - __func__); + if (ret) return ret; - } ret = ds3000_load_firmware(fe, fw); if (ret) diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c index 35b83b1dd82..56400307532 100644 --- a/drivers/media/dvb-frontends/nxt200x.c +++ b/drivers/media/dvb-frontends/nxt200x.c @@ -876,12 +876,8 @@ static int nxt2002_init(struct dvb_frontend* fe) __func__, NXT2002_DEFAULT_FIRMWARE); ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, state->i2c->dev.parent); - pr_debug("%s: Waiting for firmware upload(2)...\n", __func__); - if (ret) { - pr_err("%s: No firmware uploaded (timeout or file not found?)\n", - __func__); + if (ret) return ret; - } ret = nxt2002_load_firmware(fe, fw); release_firmware(fw); @@ -943,12 +939,8 @@ static int nxt2004_init(struct dvb_frontend* fe) __func__, NXT2004_DEFAULT_FIRMWARE); ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, state->i2c->dev.parent); - pr_debug("%s: Waiting for firmware upload(2)...\n", __func__); - if (ret) { - pr_err("%s: No firmware uploaded (timeout or file not found?)\n", - __func__); + if (ret) return ret; - } ret = nxt2004_load_firmware(fe, fw); release_firmware(fw); diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c index 35a3e47497c..d89dd35059a 100644 --- a/drivers/media/dvb-frontends/or51132.c +++ b/drivers/media/dvb-frontends/or51132.c @@ -326,10 +326,8 @@ static int or51132_set_parameters(struct dvb_frontend *fe) printk("or51132: Waiting for firmware upload(%s)...\n", fwname); ret = request_firmware(&fw, fwname, state->i2c->dev.parent); - if (ret) { - printk(KERN_WARNING "or51132: No firmware uploaded(timeout or file not found?)\n"); + if (ret) return ret; - } ret = or51132_load_firmware(fe, fw); release_firmware(fw); if (ret) { diff --git a/drivers/media/dvb-frontends/or51211.c b/drivers/media/dvb-frontends/or51211.c index ddcaea5c994..fb198eb3181 100644 --- a/drivers/media/dvb-frontends/or51211.c +++ b/drivers/media/dvb-frontends/or51211.c @@ -361,11 +361,8 @@ static int or51211_init(struct dvb_frontend* fe) OR51211_DEFAULT_FIRMWARE); ret = config->request_firmware(fe, &fw, OR51211_DEFAULT_FIRMWARE); - pr_info("Got Hotplug firmware\n"); - if (ret) { - pr_warn("No firmware uploaded (timeout or file not found?)\n"); + if (ret) return ret; - } ret = or51211_load_firmware(fe, fw); release_firmware(fw); diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c index 655db827226..5c3ff08e924 100644 --- a/drivers/media/dvb-frontends/sp8870.c +++ b/drivers/media/dvb-frontends/sp8870.c @@ -304,10 +304,8 @@ static int sp8870_init (struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE); - if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) { - printk("sp8870: no firmware upload (timeout or file not found?)\n"); + if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) return -EIO; - } if (sp8870_firmware_upload(state, fw)) { printk("sp8870: writing firmware to device failed\n"); diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c index c89a91a3daf..9fdf51248c2 100644 --- a/drivers/media/dvb-frontends/sp887x.c +++ b/drivers/media/dvb-frontends/sp887x.c @@ -527,10 +527,8 @@ static int sp887x_init(struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk("sp887x: waiting for firmware upload (%s)...\n", SP887X_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, SP887X_DEFAULT_FIRMWARE); - if (ret) { - printk("sp887x: no firmware upload (timeout or file not found?)\n"); + if (ret) return ret; - } ret = sp887x_initial_setup(fe, fw); release_firmware(fw); diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c index d1d206ebded..110961be6a0 100644 --- a/drivers/media/dvb-frontends/tda10048.c +++ b/drivers/media/dvb-frontends/tda10048.c @@ -483,8 +483,6 @@ static int tda10048_firmware_upload(struct dvb_frontend *fe) ret = request_firmware(&fw, TDA10048_DEFAULT_FIRMWARE, state->i2c->dev.parent); if (ret) { - printk(KERN_ERR "%s: Upload failed. (file not found?)\n", - __func__); return -EIO; } else { printk(KERN_INFO "%s: firmware read %zu bytes.\n", diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c index 83a798ca9b0..f36cc486edf 100644 --- a/drivers/media/dvb-frontends/tda1004x.c +++ b/drivers/media/dvb-frontends/tda1004x.c @@ -388,10 +388,8 @@ static int tda10045_fwupload(struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk(KERN_INFO "tda1004x: waiting for firmware upload (%s)...\n", TDA10045_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE); - if (ret) { - printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n"); + if (ret) return ret; - } /* reset chip */ tda1004x_write_mask(state, TDA1004X_CONFC4, 0x10, 0); @@ -532,7 +530,6 @@ static int tda10046_fwupload(struct dvb_frontend* fe) /* remain compatible to old bug: try to load with tda10045 image name */ ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE); if (ret) { - printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n"); return ret; } else { printk(KERN_INFO "tda1004x: please rename the firmware file to %s\n", diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c index 1953b00b3e4..d0804f6086a 100644 --- a/drivers/media/dvb-frontends/tda10071.c +++ b/drivers/media/dvb-frontends/tda10071.c @@ -837,12 +837,8 @@ static int tda10071_init(struct dvb_frontend *fe) /* request the firmware, this will block and timeout */ ret = request_firmware(&fw, fw_file, &client->dev); - if (ret) { - dev_err(&client->dev, - "did not find the firmware file '%s' (status %d). You can use /scripts/get_dvb_firmware to get the firmware\n", - fw_file, ret); + if (ret) goto error; - } /* init */ for (i = 0; i < ARRAY_SIZE(tab2); i++) { diff --git a/drivers/media/i2c/cx25840/cx25840-firmware.c b/drivers/media/i2c/cx25840/cx25840-firmware.c index 02df45ccf57..9ce75298c6e 100644 --- a/drivers/media/i2c/cx25840/cx25840-firmware.c +++ b/drivers/media/i2c/cx25840/cx25840-firmware.c @@ -113,10 +113,8 @@ int cx25840_loadfw(struct i2c_client *client) if (is_cx231xx(state) && max_buf_size > 16) max_buf_size = 16; - if (request_firmware(&fw, fwname, FWDEV(client)) != 0) { - v4l_err(client, "unable to open firmware %s\n", fwname); + if (request_firmware(&fw, fwname, FWDEV(client)) != 0) return -EINVAL; - } start_fw_load(client); diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c index 16148802dab..c2afea668c6 100644 --- a/drivers/media/pci/bt8xx/bttv-cards.c +++ b/drivers/media/pci/bt8xx/bttv-cards.c @@ -3904,10 +3904,8 @@ static int pvr_boot(struct bttv *btv) int rc; rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev); - if (rc != 0) { - pr_warn("%d: no altera firmware [via hotplug]\n", btv->c.nr); + if (rc != 0) return rc; - } rc = pvr_altera_load(btv, fw_entry->data, fw_entry->size); pr_info("%d: altera firmware upload %s\n", btv->c.nr, (rc < 0) ? "failed" : "ok"); diff --git a/drivers/media/pci/cx18/cx18-av-firmware.c b/drivers/media/pci/cx18/cx18-av-firmware.c index 61aeb8c9af7..b93b04885e0 100644 --- a/drivers/media/pci/cx18/cx18-av-firmware.c +++ b/drivers/media/pci/cx18/cx18-av-firmware.c @@ -70,10 +70,8 @@ int cx18_av_loadfw(struct cx18 *cx) int i; int retries1 = 0; - if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) { - CX18_ERR_DEV(sd, "unable to open firmware %s\n", FWFILE); + if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) return -EINVAL; - } /* The firmware load often has byte errors, so allow for several retries, both at byte level and at the firmware load level. */ diff --git a/drivers/media/pci/cx18/cx18-dvb.c b/drivers/media/pci/cx18/cx18-dvb.c index 4c57a294b9f..5d4a00c8e28 100644 --- a/drivers/media/pci/cx18/cx18-dvb.c +++ b/drivers/media/pci/cx18/cx18-dvb.c @@ -127,9 +127,7 @@ static int yuan_mpc718_mt352_reqfw(struct cx18_stream *stream, int ret; ret = request_firmware(fw, fn, &cx->pci_dev->dev); - if (ret) - CX18_ERR("Unable to open firmware file %s\n", fn); - else { + if (!ret) { size_t sz = (*fw)->size; if (sz < 2 || sz > 64 || (sz % 2) != 0) { CX18_ERR("Firmware %s has a bad size: %lu bytes\n", diff --git a/drivers/media/pci/cx18/cx18-firmware.c b/drivers/media/pci/cx18/cx18-firmware.c index 876b96c1129..098dafd2227 100644 --- a/drivers/media/pci/cx18/cx18-firmware.c +++ b/drivers/media/pci/cx18/cx18-firmware.c @@ -92,11 +92,8 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx) u32 __iomem *dst = (u32 __iomem *)mem; const u32 *src; - if (request_firmware(&fw, fn, &cx->pci_dev->dev)) { - CX18_ERR("Unable to open firmware %s\n", fn); - CX18_ERR("Did you put the firmware in the hotplug firmware directory?\n"); + if (request_firmware(&fw, fn, &cx->pci_dev->dev)) return -ENOMEM; - } src = (const u32 *)fw->data; @@ -137,8 +134,6 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx, int sz; if (request_firmware(&fw, fn, &cx->pci_dev->dev)) { - CX18_ERR("unable to open firmware %s\n", fn); - CX18_ERR("did you put the firmware in the hotplug firmware directory?\n"); cx18_setup_page(cx, 0); return -ENOMEM; } diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 8aa5f9b1498..94cb8a1391a 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c @@ -920,12 +920,8 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) retval = request_firmware(&firmware, CX23885_FIRM_IMAGE_NAME, &dev->pci->dev); - if (retval != 0) { - pr_err("ERROR: Hotplug firmware request failed (%s).\n", - CX23885_FIRM_IMAGE_NAME); - pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n"); + if (retval != 0) return -1; - } if (firmware->size != CX23885_FIRM_IMAGE_SIZE) { pr_err("ERROR: Firmware size mismatch (have %zu, expected %d)\n", diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c index 8644205d3cd..2b495a7ca60 100644 --- a/drivers/media/pci/cx23885/cx23885-cards.c +++ b/drivers/media/pci/cx23885/cx23885-cards.c @@ -2415,10 +2415,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) cinfo.rev, filename); ret = request_firmware(&fw, filename, &dev->pci->dev); - if (ret != 0) - pr_err("did not find the firmware file '%s'. You can use /scripts/get_dvb_firmware to get the firmware.", - filename); - else + if (ret == 0) altera_init(&netup_config, fw); release_firmware(fw); diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c index 0a10c9d192f..af17dcb2282 100644 --- a/drivers/media/pci/cx88/cx88-blackbird.c +++ b/drivers/media/pci/cx88/cx88-blackbird.c @@ -462,12 +462,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME, &dev->pci->dev); - if (retval != 0) { - pr_err("Hotplug firmware request failed (%s).\n", - CX2341X_FIRM_ENC_FILENAME); - pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n"); + if (retval != 0) return -EIO; - } if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { pr_err("Firmware size mismatch (have %zd, expected %d)\n", diff --git a/drivers/media/pci/ivtv/ivtv-firmware.c b/drivers/media/pci/ivtv/ivtv-firmware.c index 56b25255faf..ee9c227c4ec 100644 --- a/drivers/media/pci/ivtv/ivtv-firmware.c +++ b/drivers/media/pci/ivtv/ivtv-firmware.c @@ -68,8 +68,6 @@ retry: release_firmware(fw); return size; } - IVTV_ERR("Unable to open firmware %s (must be %ld bytes)\n", fn, size); - IVTV_ERR("Did you put the firmware in the hotplug firmware directory?\n"); return -ENOMEM; } diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index b75ab7d2922..c0d64e68337 100644 --- a/drivers/media/pci/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c @@ -1240,19 +1240,14 @@ static int ngene_load_firm(struct ngene *dev) break; } - if (request_firmware(&fw, fw_name, &dev->pci_dev->dev) < 0) { - dev_err(pdev, "Could not load firmware file %s.\n", fw_name); - dev_info(pdev, "Copy %s to your hotplug directory!\n", - fw_name); + if (request_firmware(&fw, fw_name, &dev->pci_dev->dev)) return -1; - } if (size == 0) size = fw->size; if (size != fw->size) { dev_err(pdev, "Firmware %s has invalid size!", fw_name); err = -1; } else { - dev_info(pdev, "Loading firmware file %s.\n", fw_name); ngene_fw = (u8 *) fw->data; err = ngene_command_load_firmware(dev, ngene_fw, size); } diff --git a/drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/pci/saa7164/saa7164-fw.c index 363689484c5..447fa2dab1b 100644 --- a/drivers/media/pci/saa7164/saa7164-fw.c +++ b/drivers/media/pci/saa7164/saa7164-fw.c @@ -406,11 +406,8 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) __func__, fwname); ret = request_firmware(&fw, fwname, &dev->pci->dev); - if (ret) { - printk(KERN_ERR "%s() Upload failed. (file not found?)\n", - __func__); + if (ret) return -ENOMEM; - } printk(KERN_INFO "%s() firmware read %zu bytes.\n", __func__, fw->size); diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c index e6ee23544a6..3098d16cda9 100644 --- a/drivers/media/pci/ttpci/av7110.c +++ b/drivers/media/pci/ttpci/av7110.c @@ -1502,13 +1502,8 @@ static int get_firmware(struct av7110* av7110) /* request the av7110 firmware, this will block until someone uploads it */ ret = request_firmware(&fw, "dvb-ttpci-01.fw", &av7110->dev->pci->dev); if (ret) { - if (ret == -ENOENT) { - printk(KERN_ERR "dvb-ttpci: could not load firmware, file not found: dvb-ttpci-01.fw\n"); - printk(KERN_ERR "dvb-ttpci: usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n"); - printk(KERN_ERR "dvb-ttpci: and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n"); - } else - printk(KERN_ERR "dvb-ttpci: cannot request firmware (error %i)\n", - ret); + if (ret == -ENOENT) + printk(KERN_ERR "dvb-ttpci: firmware can be downloaded from https://linuxtv.org/download/dvb/firmware/\n"); return -EINVAL; } diff --git a/drivers/media/pci/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c index 8c2442a11f0..ca50c2c5c5c 100644 --- a/drivers/media/pci/ttpci/av7110_hw.c +++ b/drivers/media/pci/ttpci/av7110_hw.c @@ -236,11 +236,8 @@ int av7110_bootarm(struct av7110 *av7110) //saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT); ret = request_firmware(&fw, fw_name, &dev->pci->dev); - if (ret) { - printk(KERN_ERR "dvb-ttpci: Failed to load firmware \"%s\"\n", - fw_name); + if (ret) return ret; - } mwdebi(av7110, DEBISWAB, DPRAM_BASE, fw->data, fw->size); release_firmware(fw); diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index da138c31496..226a1a2ecfb 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -65,10 +65,8 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) } } - if (err != 0) { - mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n"); + if (err != 0) return -EINVAL; - } if (fw_blob->size > dev->fw_buf.size) { mfc_err("MFC firmware is too big to be loaded\n"); release_firmware(fw_blob); diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 330de50f892..62346f401aa 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c @@ -502,11 +502,8 @@ static int wl1273_fm_upload_firmware_patch(struct wl1273_device *radio) * Uploading the firmware patch is not always necessary, * so we only print an info message. */ - if (request_firmware(&fw_p, fw_name, dev)) { - dev_info(dev, "%s - %s not found\n", __func__, fw_name); - + if (request_firmware(&fw_p, fw_name, dev)) return 0; - } ptr = (__u8 *) fw_p->data; packet_num = ptr[0]; diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index cce97c9d540..23df585447b 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c @@ -1236,10 +1236,8 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name) ret = request_firmware(&fw_entry, fw_name, &fmdev->radio_dev->dev); - if (ret < 0) { - fmerr("Unable to read firmware(%s) content\n", fw_name); + if (ret) return ret; - } fmdbg("Firmware(%s) length : %zu bytes\n", fw_name, fw_entry->size); fw_data = (void *)fw_entry->data; diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c index aa6861dcd3f..b85a9a51cf1 100644 --- a/drivers/media/tuners/tuner-xc2028.c +++ b/drivers/media/tuners/tuner-xc2028.c @@ -1367,7 +1367,6 @@ static void load_firmware_cb(const struct firmware *fw, tuner_dbg("request_firmware_nowait(): %s\n", fw ? "OK" : "error"); if (!fw) { - tuner_err("Could not load firmware %s.\n", priv->fname); priv->state = XC2028_NODEV; return; } diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/media/usb/cpia2/cpia2_core.c index 20c50c2d042..b8a08126451 100644 --- a/drivers/media/usb/cpia2/cpia2_core.c +++ b/drivers/media/usb/cpia2/cpia2_core.c @@ -912,11 +912,8 @@ static int apply_vp_patch(struct camera_data *cam) struct cpia2_command cmd; ret = request_firmware(&fw, fw_name, &cam->dev->dev); - if (ret) { - printk(KERN_ERR "cpia2: failed to load VP patch \"%s\"\n", - fw_name); + if (ret) return ret; - } cmd.req_mode = CAMERAACCESS_TYPE_REPEAT | CAMERAACCESS_VP; cmd.direction = TRANSFER_WRITE; diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index 2475f69a2f1..8b3fa4c388d 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c @@ -987,11 +987,6 @@ static int cx231xx_load_firmware(struct cx231xx *dev) dev->dev); if (retval != 0) { - dev_err(dev->dev, - "ERROR: Hotplug firmware request failed (%s).\n", - CX231xx_FIRM_IMAGE_NAME); - dev_err(dev->dev, - "Please fix your hotplug setup, the board will not work without firmware loaded!\n"); vfree(p_current_fw); vfree(p_buffer); return retval; diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index 66d685065e0..19e91d7b72e 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -2413,12 +2413,9 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap) dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, 0x80); - if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) return -ENODEV; - } else { - deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); - } + deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); stk9090m_config.microcode_B_fe_size = state->frontend_firmware->size; stk9090m_config.microcode_B_fe_buffer = state->frontend_firmware->data; @@ -2479,12 +2476,9 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) msleep(20); dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1); - if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) return -EIO; - } else { - deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); - } + deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); nim9090md_config[0].microcode_B_fe_size = state->frontend_firmware->size; nim9090md_config[0].microcode_B_fe_buffer = state->frontend_firmware->data; nim9090md_config[1].microcode_B_fe_size = state->frontend_firmware->size; diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c index 42c207aacbb..95ca5700546 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c @@ -89,13 +89,9 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_pro int ret; const struct firmware *fw = NULL; - if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) { - err("did not find the firmware file '%s' (status %d). You can use /scripts/get_dvb_firmware to get the firmware", - props->firmware,ret); + ret = request_firmware(&fw, props->firmware, &udev->dev); + if (ret) return ret; - } - - info("downloading firmware from file '%s'",props->firmware); switch (props->usb_ctrl) { case CYPRESS_AN2135: diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c index 1282f701f18..826923300c4 100644 --- a/drivers/media/usb/dvb-usb/gp8psk.c +++ b/drivers/media/usb/dvb-usb/gp8psk.c @@ -131,19 +131,14 @@ static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d) const u8 *ptr; u8 *buf; if ((ret = request_firmware(&fw, bcm4500_firmware, - &d->udev->dev)) != 0) { - err("did not find the bcm4500 firmware file '%s' (status %d). You can use /scripts/get_dvb_firmware to get the firmware", - bcm4500_firmware,ret); + &d->udev->dev)) != 0) return ret; - } ret = -EINVAL; if (gp8psk_usb_out_op(d, LOAD_BCM4500,1,0,NULL, 0)) goto out_rel_fw; - info("downloading bcm4500 firmware from file '%s'",bcm4500_firmware); - ptr = fw->data; buf = kmalloc(64, GFP_KERNEL); if (!buf) { diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c index 823b33ae828..ccd7712df34 100644 --- a/drivers/media/usb/dvb-usb/opera1.c +++ b/drivers/media/usb/dvb-usb/opera1.c @@ -450,8 +450,6 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev, info("start downloading fpga firmware %s",filename); if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) { - err("did not find the firmware file '%s'. You can use /scripts/get_dvb_firmware to get the firmware", - filename); return ret; } else { p = kmalloc(fw->size, GFP_KERNEL); diff --git a/drivers/media/usb/go7007/go7007-driver.c b/drivers/media/usb/go7007/go7007-driver.c index 153a0c3e3da..2b6ffdde393 100644 --- a/drivers/media/usb/go7007/go7007-driver.c +++ b/drivers/media/usb/go7007/go7007-driver.c @@ -84,10 +84,8 @@ static int go7007_load_encoder(struct go7007 *go) u16 intr_val, intr_data; if (go->boot_fw == NULL) { - if (request_firmware(&fw_entry, fw_name, go->dev)) { - v4l2_err(go, "unable to load firmware from file \"%s\"\n", fw_name); + if (request_firmware(&fw_entry, fw_name, go->dev)) return -1; - } if (fw_entry->size < 16 || memcmp(fw_entry->data, "WISGO7007FW", 11)) { v4l2_err(go, "file \"%s\" does not appear to be go7007 firmware\n", fw_name); release_firmware(fw_entry); diff --git a/drivers/media/usb/go7007/go7007-fw.c b/drivers/media/usb/go7007/go7007-fw.c index 018019ba47d..2226047843c 100644 --- a/drivers/media/usb/go7007/go7007-fw.c +++ b/drivers/media/usb/go7007/go7007-fw.c @@ -1565,12 +1565,8 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen) default: return -1; } - if (request_firmware(&fw_entry, GO7007_FW_NAME, go->dev)) { - dev_err(go->dev, - "unable to load firmware from file \"%s\"\n", - GO7007_FW_NAME); + if (request_firmware(&fw_entry, GO7007_FW_NAME, go->dev)) return -1; - } code = kcalloc(codespace, 2, GFP_KERNEL); if (code == NULL) goto fw_failed; diff --git a/drivers/media/usb/go7007/go7007-loader.c b/drivers/media/usb/go7007/go7007-loader.c index 243aa0ad074..575bddaa61d 100644 --- a/drivers/media/usb/go7007/go7007-loader.c +++ b/drivers/media/usb/go7007/go7007-loader.c @@ -67,11 +67,8 @@ static int go7007_loader_probe(struct usb_interface *interface, dev_info(&interface->dev, "loading firmware %s\n", fw1); - if (request_firmware(&fw, fw1, &usbdev->dev)) { - dev_err(&interface->dev, - "unable to load firmware from file \"%s\"\n", fw1); + if (request_firmware(&fw, fw1, &usbdev->dev)) goto failed2; - } ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2); release_firmware(fw); if (0 != ret) { @@ -82,11 +79,8 @@ static int go7007_loader_probe(struct usb_interface *interface, if (fw2 == NULL) return 0; - if (request_firmware(&fw, fw2, &usbdev->dev)) { - dev_err(&interface->dev, - "unable to load firmware from file \"%s\"\n", fw2); + if (request_firmware(&fw, fw2, &usbdev->dev)) goto failed2; - } ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2); release_firmware(fw); if (0 != ret) { diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c index 179b2ec3df5..45b24bd52cb 100644 --- a/drivers/media/usb/gspca/vicam.c +++ b/drivers/media/usb/gspca/vicam.c @@ -230,10 +230,8 @@ static int sd_init(struct gspca_dev *gspca_dev) ret = request_ihex_firmware(&fw, VICAM_FIRMWARE, &gspca_dev->dev->dev); - if (ret) { - pr_err("Failed to load \"vicam/firmware.fw\": %d\n", ret); + if (ret) return ret; - } firmware_buf = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!firmware_buf) { diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index bbf361ce0bd..4bf19f20cfe 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -1369,25 +1369,6 @@ static int pvr2_locate_firmware(struct pvr2_hdw *hdw, "request_firmware fatal error with code=%d",ret); return ret; } - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "***WARNING*** Device %s firmware seems to be missing.", - fwtypename); - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "Did you install the pvrusb2 firmware files in their proper location?"); - if (fwcount == 1) { - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "request_firmware unable to locate %s file %s", - fwtypename,fwnames[0]); - } else { - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "request_firmware unable to locate one of the following %s files:", - fwtypename); - for (idx = 0; idx < fwcount; idx++) { - pvr2_trace(PVR2_TRACE_ERROR_LEGS, - "request_firmware: Failed to find %s", - fwnames[idx]); - } - } return ret; } diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index 3eccbd48bda..918d44eba02 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c @@ -2289,10 +2289,8 @@ static int s2255_probe(struct usb_interface *interface, } /* load the first chunk */ if (request_firmware(&dev->fw_data->fw, - FIRMWARE_FILE_NAME, &dev->udev->dev)) { - dev_err(&interface->dev, "sensoray 2255 failed to get firmware\n"); + FIRMWARE_FILE_NAME, &dev->udev->dev)) goto errorREQFW; - } /* check the firmware is valid */ fw_size = dev->fw_data->fw->size; pdata = (__le32 *) &dev->fw_data->fw->data[fw_size - 8]; diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c index 4e56ff83566..fe8224361a6 100644 --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c @@ -291,10 +291,8 @@ static int ttusb_boot_dsp(struct ttusb *ttusb) err = request_firmware(&fw, "ttusb-budget/dspbootcode.bin", &ttusb->dev->dev); - if (err) { - printk(KERN_ERR "ttusb-budget: failed to request firmware\n"); + if (err) return err; - } /* BootBlock */ b[0] = 0xaa; diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c index 1d0afa340f4..061b634d330 100644 --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c @@ -1324,11 +1324,8 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) dprintk("%s\n", __func__); result = request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev); - if (result) { - printk(KERN_ERR "%s: Firmware (%s) unavailable.\n", - __func__, dec->firmware_name); + if (result) return result; - } firmware = fw_entry->data; firmware_size = fw_entry->size; diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 18ca938b86e..503c5ddc0df 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -288,11 +288,8 @@ static long download_firmware(struct kim_data_s *kim_gdata) request_firmware(&kim_gdata->fw_entry, bts_scr_name, &kim_gdata->kim_pdev->dev); if (unlikely((err != 0) || (kim_gdata->fw_entry->data == NULL) || - (kim_gdata->fw_entry->size == 0))) { - pr_err(" request_firmware failed(errno %ld) for %s", err, - bts_scr_name); + (kim_gdata->fw_entry->size == 0))) return -EINVAL; - } ptr = (void *)kim_gdata->fw_entry->data; len = kim_gdata->fw_entry->size; /* bts_header to remove out magic number and diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c index 8f44fdd8804..9490198e6dc 100644 --- a/drivers/net/can/softing/softing_fw.c +++ b/drivers/net/can/softing/softing_fw.c @@ -226,11 +226,8 @@ int softing_load_app_fw(const char *file, struct softing *card) int8_t type_end = 0, type_entrypoint = 0; ret = request_firmware(&fw, file, &card->pdev->dev); - if (ret) { - dev_alert(&card->pdev->dev, "request_firmware(%s) got %i\n", - file, ret); + if (ret) return ret; - } dev_dbg(&card->pdev->dev, "firmware(%s) got %lu bytes\n", file, (unsigned long)fw->size); /* parse the firmware */ diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index be823c18651..32b09d7ac69 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -1283,11 +1283,8 @@ typhoon_request_firmware(struct typhoon *tp) return 0; err = request_firmware(&typhoon_fw, FIRMWARE_NAME, &tp->pdev->dev); - if (err) { - netdev_err(tp->dev, "Failed to load firmware \"%s\"\n", - FIRMWARE_NAME); + if (err) return err; - } image_data = typhoon_fw->data; remaining = typhoon_fw->size; diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 816540e6bea..bba5afa256b 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c @@ -1015,11 +1015,8 @@ static int netdev_open(struct net_device *dev) #endif /* VLAN_SUPPORT */ retval = request_firmware(&fw_rx, FIRMWARE_RX, &np->pci_dev->dev); - if (retval) { - printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n", - FIRMWARE_RX); + if (retval) goto out_init; - } if (fw_rx->size % 4) { printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n", fw_rx->size, FIRMWARE_RX); @@ -1027,11 +1024,8 @@ static int netdev_open(struct net_device *dev) goto out_rx; } retval = request_firmware(&fw_tx, FIRMWARE_TX, &np->pci_dev->dev); - if (retval) { - printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n", - FIRMWARE_TX); + if (retval) goto out_rx; - } if (fw_tx->size % 4) { printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n", fw_tx->size, FIRMWARE_TX); diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c index 80ef3e15bd2..2636043bb53 100644 --- a/drivers/net/ethernet/alacritech/slicoss.c +++ b/drivers/net/ethernet/alacritech/slicoss.c @@ -1052,11 +1052,8 @@ static int slic_load_rcvseq_firmware(struct slic_device *sdev) file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_RCV_FIRMWARE_OASIS : SLIC_RCV_FIRMWARE_MOJAVE; err = request_firmware(&fw, file, &sdev->pdev->dev); - if (err) { - dev_err(&sdev->pdev->dev, - "failed to load receive sequencer firmware %s\n", file); + if (err) return err; - } /* Do an initial sanity check concerning firmware size now. A further * check follows below. */ @@ -1127,10 +1124,8 @@ static int slic_load_firmware(struct slic_device *sdev) file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_FIRMWARE_OASIS : SLIC_FIRMWARE_MOJAVE; err = request_firmware(&fw, file, &sdev->pdev->dev); - if (err) { - dev_err(&sdev->pdev->dev, "failed to load firmware %s\n", file); + if (err) return err; - } /* Do an initial sanity check concerning firmware size now. A further * check follows below. */ diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c index 46b4207d326..6efc1f3d496 100644 --- a/drivers/net/ethernet/alteon/acenic.c +++ b/drivers/net/ethernet/alteon/acenic.c @@ -2886,11 +2886,8 @@ static int ace_load_firmware(struct net_device *dev) fw_name = "acenic/tg1.bin"; ret = request_firmware(&fw, fw_name, &ap->pdev->dev); - if (ret) { - printk(KERN_ERR "%s: Failed to load firmware \"%s\"\n", - ap->name, fw_name); + if (ret) return ret; - } fw_data = (void *)fw->data; diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index dfdd14eadd5..4417a801724 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -3718,16 +3718,13 @@ static int bnx2_request_uncached_firmware(struct bnx2 *bp) } rc = request_firmware(&bp->mips_firmware, mips_fw_file, &bp->pdev->dev); - if (rc) { - pr_err("Can't load firmware file \"%s\"\n", mips_fw_file); + if (rc) goto out; - } rc = request_firmware(&bp->rv2p_firmware, rv2p_fw_file, &bp->pdev->dev); - if (rc) { - pr_err("Can't load firmware file \"%s\"\n", rv2p_fw_file); + if (rc) goto err_release_mips_firmware; - } + mips_fw = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data; rv2p_fw = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data; if (bp->mips_firmware->size < sizeof(*mips_fw) || diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 192ff8d5da3..99cc5b479b3 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -13544,11 +13544,8 @@ static int bnx2x_init_firmware(struct bnx2x *bp) BNX2X_DEV_INFO("Loading %s\n", fw_file_name); rc = request_firmware(&bp->firmware, fw_file_name, &bp->pdev->dev); - if (rc) { - BNX2X_ERR("Can't load firmware file %s\n", - fw_file_name); + if (rc) goto request_firmware_exit; - } rc = bnx2x_check_firmware(bp); if (rc) { diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 6d1f9c82254..d892a9a4f58 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -11410,11 +11410,8 @@ static int tg3_request_firmware(struct tg3 *tp) { const struct tg3_firmware_hdr *fw_hdr; - if (request_firmware(&tp->fw, tp->fw_needed, &tp->pdev->dev)) { - netdev_err(tp->dev, "Failed to load firmware \"%s\"\n", - tp->fw_needed); + if (request_firmware(&tp->fw, tp->fw_needed, &tp->pdev->dev)) return -ENOENT; - } fw_hdr = (struct tg3_firmware_hdr *)tp->fw->data; diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c index 824eaef3070..17b9de83a28 100644 --- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c +++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c @@ -24,10 +24,8 @@ cna_read_firmware(struct pci_dev *pdev, u32 **bfi_image, const struct firmware *fw; u32 n; - if (request_firmware(&fw, fw_name, &pdev->dev)) { - dev_alert(&pdev->dev, "can't load firmware %s\n", fw_name); + if (request_firmware(&fw, fw_name, &pdev->dev)) goto error; - } *bfi_image = (u32 *)fw->data; *bfi_image_size = fw->size/sizeof(u32); diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 58f89f6a040..e25ba938b4a 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -1037,12 +1037,8 @@ int t3_get_edc_fw(struct cphy *phy, int edc_idx, int size) fw_name = get_edc_fw_name(edc_idx); if (fw_name) ret = request_firmware(&fw, fw_name, &adapter->pdev->dev); - if (ret < 0) { - dev_err(&adapter->pdev->dev, - "could not upgrade firmware: unable to load %s\n", - fw_name); + if (ret) return ret; - } /* check size, take checksum in account */ if (fw->size > size + 4) { @@ -1079,11 +1075,8 @@ static int upgrade_fw(struct adapter *adap) struct device *dev = &adap->pdev->dev; ret = request_firmware(&fw, FW_FNAME, dev); - if (ret < 0) { - dev_err(dev, "could not upgrade firmware: unable to load %s\n", - FW_FNAME); + if (ret) return ret; - } ret = t3_load_fw(adap, fw->data, fw->size); release_firmware(fw); @@ -1128,11 +1121,8 @@ static int update_tpsram(struct adapter *adap) snprintf(buf, sizeof(buf), TPSRAM_NAME, rev); ret = request_firmware(&tpsram, buf, dev); - if (ret < 0) { - dev_err(dev, "could not load TP SRAM: unable to load %s\n", - buf); + if (ret) return ret; - } ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); if (ret) diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index a65d5a9ba7d..f11cab31a63 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -1265,9 +1265,6 @@ static const struct firmware *e100_request_firmware(struct nic *nic) if (err) { if (required) { - netif_err(nic, probe, nic->netdev, - "Failed to load firmware \"%s\": %d\n", - fw_name, err); return ERR_PTR(err); } else { netif_info(nic, probe, nic->netdev, diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 337b0cbfd15..e48be8cb363 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -580,8 +580,6 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size) unsigned i; if ((status = request_firmware(&fw, mgp->fw_name, dev)) < 0) { - dev_err(dev, "Unable to load %s firmware image via hotplug\n", - mgp->fw_name); status = -EINVAL; goto abort_with_nothing; } diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c index a55f430f6a7..27470164096 100644 --- a/drivers/net/ethernet/smsc/smc91c92_cs.c +++ b/drivers/net/ethernet/smsc/smc91c92_cs.c @@ -647,10 +647,8 @@ static int osi_load_firmware(struct pcmcia_device *link) int i, err; err = request_firmware(&fw, FIRMWARE_NAME, &link->dev); - if (err) { - pr_err("Failed to load firmware \"%s\"\n", FIRMWARE_NAME); + if (err) return err; - } /* Download the Seven of Diamonds firmware */ for (i = 0; i < fw->size; i++) { diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 6fc05c106af..886a23fbe52 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -805,11 +805,8 @@ static void cas_saturn_firmware_init(struct cas *cp) return; err = request_firmware(&fw, fw_name, &cp->pdev->dev); - if (err) { - pr_err("Failed to load firmware \"%s\"\n", - fw_name); + if (err) return; - } if (fw->size < 2) { pr_err("bogus length %zu in \"%s\"\n", fw->size, fw_name); diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 71cdef9fb56..8d2659d72d7 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -357,11 +357,8 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate, } err = request_firmware(&fw, fw_name[predef], &pdev->dev); platform_device_unregister(pdev); - if (err) { - printk(KERN_ERR "Failed to load firmware \"%s\"\n", - fw_name[predef]); + if (err) return NULL; - } if (fw->size != YAM_FPGA_SIZE) { printk(KERN_ERR "Bogus length %zu in firmware \"%s\"\n", fw->size, fw_name[predef]); diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 8e210ba4a31..a17bd6f2625 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -378,10 +378,8 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth, int ret; ret = request_firmware(&fw, fwname, &kaweth->dev->dev); - if (ret) { - dev_err(&kaweth->intf->dev, "Firmware request failed\n"); + if (ret) return ret; - } if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) { dev_err(&kaweth->intf->dev, "Firmware too big: %zu\n", diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 489cba9b284..d9a41b8ff00 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c @@ -1583,11 +1583,8 @@ int i2400m_dev_bootstrap(struct i2400m *i2400m, enum i2400m_bri flags) } d_printf(1, dev, "trying firmware %s (%d)\n", fw_name, itr); ret = request_firmware(&fw, fw_name, dev); - if (ret < 0) { - dev_err(dev, "fw %s: cannot load file: %d\n", - fw_name, ret); + if (ret) continue; - } i2400m->fw_name = fw_name; ret = i2400m_fw_bootstrap(i2400m, fw, flags); release_firmware(fw); @@ -1630,8 +1627,6 @@ void i2400m_fw_cache(struct i2400m *i2400m) kref_init(&i2400m_fw->kref); result = request_firmware(&i2400m_fw->fw, i2400m->fw_name, dev); if (result < 0) { - dev_err(dev, "firmware %s: failed to cache: %d\n", - i2400m->fw_name, result); kfree(i2400m_fw); i2400m_fw = (void *) ~0; } else diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index fb649d85b8f..eb5ad93497a 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1164,9 +1164,6 @@ static void ath9k_hif_usb_firmware_cb(const struct firmware *fw, void *context) if (!ret) return; - dev_err(&hif_dev->udev->dev, - "ath9k_htc: Failed to get firmware %s\n", - hif_dev->fw_name); goto err_fw; } diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index 99f1897a775..f615dc0039d 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c @@ -1029,7 +1029,6 @@ static void carl9170_usb_firmware_step2(const struct firmware *fw, return; } - dev_err(&ar->udev->dev, "firmware not found.\n"); carl9170_usb_firmware_failed(ar); } diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c index db2c3b8d491..94b3995c37f 100644 --- a/drivers/net/wireless/atmel/at76c50x-usb.c +++ b/drivers/net/wireless/atmel/at76c50x-usb.c @@ -1617,13 +1617,8 @@ static struct fwentry *at76_load_firmware(struct usb_device *udev, at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname); ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev); - if (ret < 0) { - dev_err(&udev->dev, "firmware %s not found!\n", - fwe->fwname); - dev_err(&udev->dev, - "you may need to download the firmware from http://developer.berlios.de/projects/at76c503a/\n"); + if (ret) goto exit; - } at76_dbg(DBG_FW, "got it."); fwh = (struct at76_fw_header *)(fwe->fw->data); diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index 74538085cfb..f44930926cb 100644 --- a/drivers/net/wireless/atmel/atmel.c +++ b/drivers/net/wireless/atmel/atmel.c @@ -3893,12 +3893,8 @@ static int reset_atmel_card(struct net_device *dev) strcpy(priv->firmware_id, "atmel_at76c502.bin"); } err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev); - if (err != 0) { - printk(KERN_ALERT - "%s: firmware %s is missing, cannot continue.\n", - dev->name, priv->firmware_id); + if (err != 0) return err; - } } else { int fw_index = 0; int success = 0; diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c index 20815a71680..5d9d648ad10 100644 --- a/drivers/net/wireless/broadcom/b43/main.c +++ b/drivers/net/wireless/broadcom/b43/main.c @@ -2243,19 +2243,8 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx, } err = request_firmware(&ctx->blob, ctx->fwname, ctx->dev->dev->dev); - if (err == -ENOENT) { - snprintf(ctx->errors[ctx->req_type], - sizeof(ctx->errors[ctx->req_type]), - "Firmware file \"%s\" not found\n", - ctx->fwname); - return err; - } else if (err) { - snprintf(ctx->errors[ctx->req_type], - sizeof(ctx->errors[ctx->req_type]), - "Firmware file \"%s\" request failed (err=%d)\n", - ctx->fwname, err); + if (err) return err; - } fw_ready: if (ctx->blob->size < sizeof(struct b43_fw_header)) goto err_format; diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c index 4325e91736e..dc7c94cc164 100644 --- a/drivers/net/wireless/broadcom/b43legacy/main.c +++ b/drivers/net/wireless/broadcom/b43legacy/main.c @@ -1522,11 +1522,8 @@ static int do_request_fw(struct b43legacy_wldev *dev, } else { err = request_firmware(fw, path, dev->dev->dev); } - if (err) { - b43legacyerr(dev->wl, "Firmware file \"%s\" not found " - "or load failed.\n", path); + if (err) return err; - } if ((*fw)->size < sizeof(struct b43legacy_fw_header)) goto err_format; hdr = (struct b43legacy_fw_header *)((*fw)->data); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c index 6188275b17e..c8485a3d62f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c @@ -378,19 +378,13 @@ static int brcms_request_fw(struct brcms_info *wl, struct bcma_device *pdev) sprintf(fw_name, "%s-%d.fw", brcms_firmwares[i], UCODE_LOADER_API_VER); status = request_firmware(&wl->fw.fw_bin[i], fw_name, device); - if (status) { - wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n", - KBUILD_MODNAME, fw_name); + if (status) return status; - } sprintf(fw_name, "%s_hdr-%d.fw", brcms_firmwares[i], UCODE_LOADER_API_VER); status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device); - if (status) { - wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n", - KBUILD_MODNAME, fw_name); + if (status) return status; - } wl->fw.hdr_num_entries[i] = wl->fw.fw_hdr[i]->size / (sizeof(struct firmware_hdr)); } diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c index 75c0c29d81f..d9fe9971c4d 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@ -8392,12 +8392,8 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv, rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev); - if (rc < 0) { - printk(KERN_ERR DRV_NAME ": " - "%s: Firmware '%s' not available or load failed.\n", - priv->net_dev->name, fw_name); + if (rc) return rc; - } IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data, fw->fw_entry->size); diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index fa55d2ccbfa..0460b9e3ae7 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c @@ -3396,10 +3396,8 @@ static int ipw_get_fw(struct ipw_priv *priv, /* ask firmware_class module to get the boot firmware off disk */ rc = request_firmware(raw, name, &priv->pci_dev->dev); - if (rc < 0) { - IPW_ERROR("%s request_firmware failed: Reason %d\n", name, rc); + if (rc) return rc; - } if ((*raw)->size < sizeof(*fw)) { IPW_ERROR("%s is too small (%zd)\n", name, (*raw)->size); diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c index b82da75a9ae..f1ce1c19712 100644 --- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c @@ -1839,7 +1839,6 @@ il3945_read_ucode(struct il_priv *il) sprintf(buf, "%s%u%s", name_pre, idx, ".ucode"); ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev); if (ret < 0) { - IL_ERR("%s firmware file req failed: %d\n", buf, ret); if (ret == -ENOENT) continue; else diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index fa81ad67539..23870681ab8 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -233,8 +233,6 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) } if (drv->fw_index < cfg->ucode_api_min) { - IWL_ERR(drv, "no suitable firmware found!\n"); - if (cfg->ucode_api_min == cfg->ucode_api_max) { IWL_ERR(drv, "%s%d is required\n", cfg->fw_name_pre, cfg->ucode_api_max); diff --git a/drivers/net/wireless/intersil/orinoco/fw.c b/drivers/net/wireless/intersil/orinoco/fw.c index 400a3521764..2559f7f1252 100644 --- a/drivers/net/wireless/intersil/orinoco/fw.c +++ b/drivers/net/wireless/intersil/orinoco/fw.c @@ -132,7 +132,6 @@ orinoco_dl_firmware(struct orinoco_private *priv, err = request_firmware(&fw_entry, firmware, priv->dev); if (err) { - dev_err(dev, "Cannot find firmware %s\n", firmware); err = -ENOENT; goto free; } @@ -292,10 +291,8 @@ symbol_dl_firmware(struct orinoco_private *priv, const struct firmware *fw_entry; if (!orinoco_cached_fw_get(priv, true)) { - if (request_firmware(&fw_entry, fw->pri_fw, priv->dev) != 0) { - dev_err(dev, "Cannot find firmware: %s\n", fw->pri_fw); + if (request_firmware(&fw_entry, fw->pri_fw, priv->dev) != 0) return -ENOENT; - } } else fw_entry = orinoco_cached_fw_get(priv, true); @@ -311,10 +308,8 @@ symbol_dl_firmware(struct orinoco_private *priv, } if (!orinoco_cached_fw_get(priv, false)) { - if (request_firmware(&fw_entry, fw->sta_fw, priv->dev) != 0) { - dev_err(dev, "Cannot find firmware: %s\n", fw->sta_fw); + if (request_firmware(&fw_entry, fw->sta_fw, priv->dev) != 0) return -ENOENT; - } } else fw_entry = orinoco_cached_fw_get(priv, false); diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c index 40a8b941ad5..ca8db4d33b0 100644 --- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c @@ -1674,7 +1674,6 @@ static int ezusb_probe(struct usb_interface *interface, if (ezusb_firmware_download(upriv, &firmware) < 0) goto error; } else { - err("No firmware to download"); goto error; } diff --git a/drivers/net/wireless/intersil/p54/p54pci.c b/drivers/net/wireless/intersil/p54/p54pci.c index 80ad0b7eaef..909b92e1eca 100644 --- a/drivers/net/wireless/intersil/p54/p54pci.c +++ b/drivers/net/wireless/intersil/p54/p54pci.c @@ -496,7 +496,6 @@ static void p54p_firmware_step2(const struct firmware *fw, int err; if (!fw) { - dev_err(&pdev->dev, "Cannot find firmware (isl3886pci)\n"); err = -ENOENT; goto out; } diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c index ab0fe856585..9c57aab8a22 100644 --- a/drivers/net/wireless/intersil/p54/p54spi.c +++ b/drivers/net/wireless/intersil/p54/p54spi.c @@ -157,10 +157,8 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev) /* FIXME: should driver use it's own struct device? */ ret = request_firmware(&priv->firmware, "3826.arm", &priv->spi->dev); - if (ret < 0) { - dev_err(&priv->spi->dev, "request_firmware() failed: %d", ret); + if (ret) return ret; - } ret = p54_parse_firmware(dev, priv->firmware); if (ret) { diff --git a/drivers/net/wireless/intersil/p54/p54usb.c b/drivers/net/wireless/intersil/p54/p54usb.c index b94764c8875..25374d2e2fa 100644 --- a/drivers/net/wireless/intersil/p54/p54usb.c +++ b/drivers/net/wireless/intersil/p54/p54usb.c @@ -928,7 +928,6 @@ static void p54u_load_firmware_cb(const struct firmware *firmware, err = p54u_start_ops(priv); } else { err = -ENOENT; - dev_err(&udev->dev, "Firmware not found.\n"); } complete(&priv->fw_wait_load); diff --git a/drivers/net/wireless/intersil/prism54/islpci_dev.c b/drivers/net/wireless/intersil/prism54/islpci_dev.c index a9bae69222d..1e9d25d296a 100644 --- a/drivers/net/wireless/intersil/prism54/islpci_dev.c +++ b/drivers/net/wireless/intersil/prism54/islpci_dev.c @@ -80,12 +80,9 @@ isl_upload_firmware(islpci_private *priv) const u32 *fw_ptr; rc = request_firmware(&fw_entry, priv->firmware, PRISM_FW_PDEV); - if (rc) { - printk(KERN_ERR - "%s: request_firmware() failed for '%s'\n", - "prism54", priv->firmware); + if (rc) return rc; - } + /* prepare the Direct Memory Base register */ reg = ISL38XX_DEV_FIRMWARE_ADDRES; diff --git a/drivers/net/wireless/marvell/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c index 28a8bd3cf10..cd24a2dd2dd 100644 --- a/drivers/net/wireless/marvell/libertas_tf/if_usb.c +++ b/drivers/net/wireless/marvell/libertas_tf/if_usb.c @@ -817,8 +817,6 @@ static int if_usb_prog_firmware(struct lbtf_private *priv) kernel_param_lock(THIS_MODULE); ret = request_firmware(&cardp->fw, lbtf_fw_name, &cardp->udev->dev); if (ret < 0) { - pr_err("request_firmware() failed with %#x\n", ret); - pr_err("firmware %s not found\n", lbtf_fw_name); kernel_param_unlock(THIS_MODULE); goto done; } diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index f6da8edab7f..6721c044220 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -528,11 +528,8 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context) struct wireless_dev *wdev; struct completion *fw_done = adapter->fw_done; - if (!firmware) { - mwifiex_dbg(adapter, ERROR, - "Failed to get firmware %s\n", adapter->fw_name); + if (!firmware) goto err_dnld_fw; - } memset(&fw, 0, sizeof(struct mwifiex_fw_image)); adapter->firmware = firmware; diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c index c4db6417748..ca8342530e5 100644 --- a/drivers/net/wireless/marvell/mwl8k.c +++ b/drivers/net/wireless/marvell/mwl8k.c @@ -5727,16 +5727,12 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv); static void mwl8k_fw_state_machine(const struct firmware *fw, void *context) { struct mwl8k_priv *priv = context; - struct mwl8k_device_info *di = priv->device_info; int rc; switch (priv->fw_state) { case FW_STATE_INIT: - if (!fw) { - printk(KERN_ERR "%s: Error requesting helper fw %s\n", - pci_name(priv->pdev), di->helper_image); + if (!fw) goto fail; - } priv->fw_helper = fw; rc = mwl8k_request_fw(priv, priv->fw_pref, &priv->fw_ucode, true); @@ -5771,11 +5767,8 @@ static void mwl8k_fw_state_machine(const struct firmware *fw, void *context) break; case FW_STATE_LOADING_ALT: - if (!fw) { - printk(KERN_ERR "%s: Error requesting alt fw %s\n", - pci_name(priv->pdev), di->helper_image); + if (!fw) goto fail; - } priv->fw_ucode = fw; rc = mwl8k_firmware_load_success(priv); if (rc) @@ -5813,10 +5806,8 @@ retry: /* Ask userland hotplug daemon for the device firmware */ rc = mwl8k_request_firmware(priv, fw_image, nowait); - if (rc) { - wiphy_err(hw->wiphy, "Firmware files not found\n"); + if (rc) return rc; - } if (nowait) return rc; diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c b/drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c index c20886b02e6..e7ec16d56b4 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c @@ -38,10 +38,8 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev) rt2x00_info(rt2x00dev, "Loading firmware file '%s'\n", fw_name); retval = request_firmware(&fw, fw_name, device); - if (retval) { - rt2x00_err(rt2x00dev, "Failed to request Firmware\n"); + if (retval) return retval; - } if (!fw || !fw->size || !fw->data) { rt2x00_err(rt2x00dev, "Failed to read Firmware\n"); diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index f73e690bbe8..3fd8ef29a9d 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -89,7 +89,6 @@ static void rtl_fw_do_work(const struct firmware *firmware, void *context, if (!err) goto found_alt; } - pr_err("Selected firmware is not available\n"); rtlpriv->max_fw_size = 0; return; } diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c index d1d84e7d47a..68751cc74f9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c @@ -64,13 +64,11 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context) 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) { - pr_err("Firmware %s not available\n", fw_name); rtlpriv->max_fw_size = 0; return; } diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 480a8d08487..4e9d99efe0b 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -57,10 +57,8 @@ static int wl1251_fetch_firmware(struct wl1251 *wl) ret = request_firmware(&fw, WL1251_FW_NAME, dev); - if (ret < 0) { - wl1251_error("could not get firmware: %d", ret); + if (ret) return ret; - } if (fw->size % 4) { wl1251_error("firmware size is not multiple of 32 bits: %zu", @@ -96,10 +94,8 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) ret = request_firmware(&fw, WL1251_NVS_NAME, dev); - if (ret < 0) { - wl1251_error("could not get nvs file: %d", ret); + if (ret) return ret; - } if (fw->size % 4) { wl1251_error("nvs size is not multiple of 32 bits: %zu", diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index c9a485ecee7..fca659f7657 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -755,10 +755,8 @@ static int wl12xx_fetch_firmware(struct wl1271 *wl, bool plt) ret = request_firmware(&fw, fw_name, wl->dev); - if (ret < 0) { - wl1271_error("could not get firmware %s: %d", fw_name, ret); + if (ret) return ret; - } if (fw->size % 4) { wl1271_error("firmware size is not multiple of 32 bits: %zu", diff --git a/drivers/net/wireless/zydas/zd1201.c b/drivers/net/wireless/zydas/zd1201.c index 0db7362bedb..13d21da6084 100644 --- a/drivers/net/wireless/zydas/zd1201.c +++ b/drivers/net/wireless/zydas/zd1201.c @@ -62,8 +62,6 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw) err = request_firmware(&fw_entry, fwfile, &dev->dev); if (err) { - dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile); - dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n"); dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info.\n"); return err; } diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c index 1965cd0fafc..05b4645c4be 100644 --- a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c @@ -108,16 +108,9 @@ static void int_urb_complete(struct urb *urb); static int request_fw_file( const struct firmware **fw, const char *name, struct device *device) { - int r; - dev_dbg_f(device, "fw name %s\n", name); - r = request_firmware(fw, name, device); - if (r) - dev_err(device, - "Could not load firmware file %s. Error number %d\n", - name, r); - return r; + return request_firmware(fw, name, device); } static inline u16 get_bcdDevice(const struct usb_device *udev) diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 926311c792d..0603ba4f5b0 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -4103,8 +4103,6 @@ static int AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM; return err; } @@ -4469,8 +4467,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; return err; } @@ -4969,8 +4965,6 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; return err; } @@ -5457,8 +5451,6 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc) err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; return err; } diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 261d8e495fe..80b1bdc6b3f 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -365,8 +365,6 @@ static ssize_t asd_store_update_bios(struct device *dev, filename_ptr, &asd_ha->pcidev->dev); if (err) { - asd_printk("Failed to load bios image file %s, error %d\n", - filename_ptr, err); err = FAIL_OPEN_BIOS_FILE; goto out1; } diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 11853ec29d8..f2015d70518 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c @@ -1299,11 +1299,8 @@ int asd_init_seqs(struct asd_ha_struct *asd_ha) err = asd_request_firmware(asd_ha); - if (err) { - asd_printk("Failed to load sequencer firmware file %s, error %d\n", - SAS_RAZOR_SEQUENCER_FW_FILE, err); + if (err) return err; - } err = asd_seq_download_seqs(asd_ha); if (err) { diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 2f9213b257a..73e877b97e1 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -1749,7 +1749,6 @@ bfad_read_firmware(struct pci_dev *pdev, u32 **bfi_image, const struct firmware *fw; if (request_firmware(&fw, fw_name, &pdev->dev)) { - printk(KERN_ALERT "Can't locate firmware %s\n", fw_name); *bfi_image = NULL; goto out; } diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index d06bc1a817a..682ba3f97d6 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -4088,10 +4088,8 @@ static ssize_t ipr_store_update_fw(struct device *dev, if (endline) *endline = '\0'; - if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { - dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); + if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) return -EIO; - } image_hdr = (struct ipr_ucode_image_header *)fw_entry->data; diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c index d193961ea82..226dd925100 100644 --- a/drivers/scsi/pm8001/pm8001_ctl.c +++ b/drivers/scsi/pm8001/pm8001_ctl.c @@ -737,10 +737,6 @@ static ssize_t pm8001_store_update_fw(struct device *cdev, pm8001_ha->dev); if (ret) { - PM8001_FAIL_DBG(pm8001_ha, - pm8001_printk( - "Failed to load firmware image file %s, error %d\n", - filename_ptr, ret)); pm8001_ha->fw_status = FAIL_OPEN_BIOS_FILE; goto out; } diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index e5760c4a27f..4f3af798698 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -1533,8 +1533,6 @@ qla1280_request_firmware(struct scsi_qla_host *ha) err = request_firmware(&fw, fwname, &ha->pdev->dev); if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); fw = ERR_PTR(err); goto unlock; } diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 6a4c719497c..d44350bb26d 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -7781,10 +7781,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) /* Load firmware blob. */ blob = qla2x00_request_firmware(vha); if (!blob) { - ql_log(ql_log_info, vha, 0x0083, - "Firmware image unavailable.\n"); - ql_log(ql_log_info, vha, 0x0084, - "Firmware images can be retrieved from: "QLA_FW_URL ".\n"); return QLA_FUNCTION_FAILED; } @@ -7887,9 +7883,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) blob = qla2x00_request_firmware(vha); if (!blob) { - ql_log(ql_log_warn, vha, 0x0092, - "-> Firmware file not found.\n"); - return QLA_FUNCTION_FAILED; } diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index c760ae35417..23054f358a4 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -2475,11 +2475,8 @@ try_blob_fw: /* Load firmware blob. */ blob = ha->hablob = qla2x00_request_firmware(vha); - if (!blob) { - ql_log(ql_log_fatal, vha, 0x00a3, - "Firmware image not present.\n"); + if (!blob) goto fw_load_failed; - } /* Validating firmware blob */ if (qla82xx_validate_firmware_blob(vha, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 794478e5f7e..f584c90a1b7 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -6813,8 +6813,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha) goto out; if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) { - ql_log(ql_log_warn, vha, 0x0063, - "Failed to load firmware image (%s).\n", blob->name); blob->fw = NULL; blob = NULL; } diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 9335849f6be..8707c2c0887 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -476,11 +476,8 @@ static int qlogicpti_load_firmware(struct qlogicpti *qpti) int i, timeout; err = request_firmware(&fw, fwname, &qpti->op->dev); - if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - fwname, err); + if (err) return err; - } if (fw->size % 2) { printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", fw->size, fwname); diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c index 153d4ee0ec0..d74a20f10a2 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware.c +++ b/drivers/staging/rtl8192u/r819xU_firmware.c @@ -245,10 +245,8 @@ bool init_firmware(struct net_device *dev) */ if (rst_opt == OPT_SYSTEM_RESET) { rc = request_firmware(&fw_entry, fw_name[init_step], &priv->udev->dev); - if (rc < 0) { - RT_TRACE(COMP_ERR, "request firmware fail!\n"); + if (rc) goto download_firmware_fail; - } if (fw_entry->size > sizeof(pfirmware->firmware_buf)) { RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n"); diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c index 401f0e442bc..15fc2e7de3a 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -59,8 +59,6 @@ int rtl871x_load_fw(struct _adapter *padapter) dev_info(dev, "r8712u: Loading firmware from \"%s\"\n", firmware_file); rc = request_firmware_nowait(THIS_MODULE, 1, firmware_file, dev, GFP_KERNEL, padapter, rtl871x_load_fw_cb); - if (rc) - dev_err(dev, "r8712u: Firmware request error %d\n", rc); return rc; } MODULE_FIRMWARE("rtlwifi/rtl8712u.bin"); diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index 38521c33891..7f1fdafeb1d 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -39,11 +39,8 @@ int vnt_download_firmware(struct vnt_private *priv) dev_dbg(dev, "---->Download firmware\n"); rc = request_firmware(&fw, FIRMWARE_NAME, dev); - if (rc) { - dev_err(dev, "firmware file %s request failed (%d)\n", - FIRMWARE_NAME, rc); - goto out; - } + if (rc) + goto out; buffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL); if (!buffer) diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index 4562c8060d0..a36a72c11cd 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c @@ -3484,10 +3484,8 @@ static int cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr, int retval; retval = request_firmware(&fw, "cyzfirm.bin", &pdev->dev); - if (retval) { - dev_err(&pdev->dev, "can't get firmware\n"); + if (retval) goto err; - } /* Check whether the firmware is already loaded and running. If positive, skip this board */ diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index 3a1a5e0ee93..40d156d9c9e 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -854,13 +854,8 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev) } ret = request_firmware(&fw, file, dev); - if (ret) { - printk(KERN_ERR "MOXA: request_firmware failed. Make sure " - "you've placed '%s' file into your firmware " - "loader directory (e.g. /lib/firmware)\n", - file); + if (ret) goto err_free; - } ret = moxa_load_fw(brd, fw); diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index ad374f7c476..ff1dbcaab74 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c @@ -360,7 +360,6 @@ static void load_code(struct icom_port *icom_port) /* Load Call Setup into Adapter */ if (request_firmware(&fw, "icom_call_setup.bin", &dev->dev) < 0) { - dev_err(&dev->dev,"Unable to load icom_call_setup.bin firmware image\n"); status = -1; goto load_code_exit; } @@ -380,7 +379,6 @@ static void load_code(struct icom_port *icom_port) /* Load Resident DCE portion of Adapter */ if (request_firmware(&fw, "icom_res_dce.bin", &dev->dev) < 0) { - dev_err(&dev->dev,"Unable to load icom_res_dce.bin firmware image\n"); status = -1; goto load_code_exit; } @@ -425,7 +423,6 @@ static void load_code(struct icom_port *icom_port) } if (request_firmware(&fw, "icom_asc.bin", &dev->dev) < 0) { - dev_err(&dev->dev,"Unable to load icom_asc.bin firmware image\n"); status = -1; goto load_code_exit; } diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 6e3c66ab0e6..6565ef2ebd8 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -1165,10 +1165,8 @@ static void uart_firmware_cont(const struct firmware *fw, void *context) struct device *dev = context; int ret; - if (!fw) { - dev_err(dev, "firmware not found\n"); + if (!fw) return; - } firmware = (struct qe_firmware *) fw->data; diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index e57a2be8754..c34dc137211 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c @@ -1080,8 +1080,6 @@ static int cxacru_find_firmware(struct cxacru_data *instance, return -ENOENT; } - usb_info(usbatm, "found firmware %s\n", buf); - return 0; } diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index 2754b4ce713..d2804e333ef 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c @@ -650,10 +650,8 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, int ret, size; uea_enters(usb); - if (!fw_entry) { - uea_err(usb, "firmware is not available\n"); + if (!fw_entry) goto err; - } pfw = fw_entry->data; size = fw_entry->size; @@ -748,10 +746,6 @@ static int uea_load_firmware(struct usb_device *usb, unsigned int ver) ret = request_firmware_nowait(THIS_MODULE, 1, fw_name, &usb->dev, GFP_KERNEL, usb, uea_upload_pre_firmware); - if (ret) - uea_err(usb, "firmware %s is not available\n", fw_name); - else - uea_info(usb, "loading firmware %s\n", fw_name); uea_leaves(usb); return ret; @@ -913,12 +907,8 @@ static int request_dsp(struct uea_softc *sc) } ret = request_firmware(&sc->dsp_firm, dsp_name, &sc->usb_dev->dev); - if (ret < 0) { - uea_err(INS_TO_USBDEV(sc), - "requesting firmware %s failed with error %d\n", - dsp_name, ret); + if (ret) return ret; - } if (UEA_CHIP_VERSION(sc) == EAGLE_IV) ret = check_dsp_e4(sc->dsp_firm->data, sc->dsp_firm->size); @@ -1631,12 +1621,8 @@ static int request_cmvs_old(struct uea_softc *sc, cmvs_file_name(sc, cmv_name, 1); ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev); - if (ret < 0) { - uea_err(INS_TO_USBDEV(sc), - "requesting firmware %s failed with error %d\n", - cmv_name, ret); + if (ret) return ret; - } data = (u8 *) (*fw)->data; size = (*fw)->size; @@ -1673,9 +1659,6 @@ static int request_cmvs(struct uea_softc *sc, "try to get older cmvs\n", cmv_name); return request_cmvs_old(sc, cmvs, fw); } - uea_err(INS_TO_USBDEV(sc), - "requesting firmware %s failed with error %d\n", - cmv_name, ret); return ret; } @@ -1958,11 +1941,8 @@ static int load_XILINX_firmware(struct uea_softc *sc) uea_enters(INS_TO_USBDEV(sc)); ret = request_firmware(&fw_entry, fw_name, &sc->usb_dev->dev); - if (ret) { - uea_err(INS_TO_USBDEV(sc), "firmware %s is not available\n", - fw_name); + if (ret) goto err0; - } pfw = fw_entry->data; size = fw_entry->size; diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c index 24d841850e0..84e62e60c8a 100644 --- a/drivers/usb/misc/emi26.c +++ b/drivers/usb/misc/emi26.c @@ -85,21 +85,17 @@ static int emi26_load_firmware (struct usb_device *dev) err = request_ihex_firmware(&loader_fw, "emi26/loader.fw", &dev->dev); if (err) - goto nofw; + goto wraperr; err = request_ihex_firmware(&bitstream_fw, "emi26/bitstream.fw", &dev->dev); if (err) - goto nofw; + goto wraperr; err = request_ihex_firmware(&firmware_fw, "emi26/firmware.fw", &dev->dev); - if (err) { - nofw: - dev_err(&dev->dev, "%s - request_firmware() failed\n", - __func__); + if (err) goto wraperr; - } /* Assert reset (stop the CPU in the EMI) */ err = emi26_set_reset(dev,1); diff --git a/drivers/usb/misc/ezusb.c b/drivers/usb/misc/ezusb.c index f058d802976..4457095c5dd 100644 --- a/drivers/usb/misc/ezusb.c +++ b/drivers/usb/misc/ezusb.c @@ -76,12 +76,8 @@ static int ezusb_ihex_firmware_download(struct usb_device *dev, const struct ihex_binrec *record; if (request_ihex_firmware(&firmware, firmware_path, - &dev->dev)) { - dev_err(&dev->dev, - "%s - request \"%s\" failed\n", - __func__, firmware_path); + &dev->dev)) goto out; - } ret = ezusb_set_reset(dev, fx.cpucs_reg, 0); if (ret < 0) diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index 4d30095d6ad..e217999b192 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c @@ -45,7 +45,6 @@ static int isight_firmware_load(struct usb_interface *intf, return -ENOMEM; if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { - printk(KERN_ERR "Unable to load isight firmware\n"); ret = -ENODEV; goto out; } diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 48a439298a6..8c56351b2f7 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -375,11 +375,8 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial) response = request_ihex_firmware(&fw, fw_name, &edge_serial->serial->dev->dev); - if (response) { - dev_err(dev, "Failed to load image \"%s\" err %d\n", - fw_name, response); + if (response) return; - } rec = (const struct ihex_binrec *)fw->data; BootMajorVersion = rec->data[0]; diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index c327d4cf792..ac3c2ae52f7 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -1010,8 +1010,6 @@ static int download_fw(struct edgeport_serial *serial) status = request_firmware(&fw, fw_name, dev); if (status) { - dev_err(dev, "Failed to load image \"%s\" err %d\n", - fw_name, status); return status; } diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index dd0ad67aa71..476f4a4f90e 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -1667,10 +1667,8 @@ static int ti_download_firmware(struct ti_device *tdev) } check_firmware: - if (status) { - dev_err(&dev->dev, "%s - firmware not found\n", __func__); + if (status) return -ENOENT; - } if (fw_p->size > TI_FIRMWARE_BUF_SIZE) { dev_err(&dev->dev, "%s - firmware too large %zu\n", __func__, fw_p->size); release_firmware(fw_p); diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c index d6ba348deb9..50b5eaa2b2f 100644 --- a/drivers/video/fbdev/broadsheetfb.c +++ b/drivers/video/fbdev/broadsheetfb.c @@ -743,10 +743,8 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev, return -EINVAL; err = request_firmware(&fw_entry, "broadsheet.wbf", dev); - if (err < 0) { - dev_err(dev, "Failed to get broadsheet waveform\n"); + if (err) goto err_failed; - } /* try to enforce reasonable min max on waveform */ if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) { diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c index bb4fee52e50..e851c19c205 100644 --- a/drivers/video/fbdev/metronomefb.c +++ b/drivers/video/fbdev/metronomefb.c @@ -679,10 +679,8 @@ static int metronomefb_probe(struct platform_device *dev) a) request the waveform file from userspace b) process waveform and decode into metromem */ retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev); - if (retval < 0) { - dev_err(&dev->dev, "Failed to get waveform\n"); + if (retval) goto err_csum_table; - } retval = load_waveform((u8 *) fw_entry->data, fw_entry->size, 3, 31, par); diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c index f0d31b0a178..515ff165d77 100644 --- a/sound/drivers/vx/vx_hwdep.c +++ b/sound/drivers/vx/vx_hwdep.c @@ -58,10 +58,8 @@ int snd_vx_setup_firmware(struct vx_core *chip) if (! fw_files[chip->type][i]) continue; sprintf(path, "vx/%s", fw_files[chip->type][i]); - if (request_firmware(&fw, path, chip->dev)) { - snd_printk(KERN_ERR "vx: can't load firmware %s\n", path); + if (request_firmware(&fw, path, chip->dev)) return -ENOENT; - } err = chip->ops->load_dsp(chip, i, fw); if (err < 0) { release_firmware(fw); diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index e435ebd0ced..ae8b99c9063 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c @@ -376,15 +376,11 @@ static int upload_dsp_code(struct snd_card *card) outb(HPBLKSEL_0, chip->io + HP_BLKS); err = request_firmware(&init_fw, INITCODEFILE, card->dev); - if (err < 0) { - printk(KERN_ERR LOGNAME ": Error loading " INITCODEFILE); + if (err) goto cleanup1; - } err = request_firmware(&perm_fw, PERMCODEFILE, card->dev); - if (err < 0) { - printk(KERN_ERR LOGNAME ": Error loading " PERMCODEFILE); + if (err) goto cleanup; - } memcpy_toio(chip->mappedbase, perm_fw->data, perm_fw->size); if (snd_msnd_upload_host(chip, init_fw->data, init_fw->size) < 0) { diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 5363d88cc4b..209e645be53 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -531,10 +531,8 @@ static int sscape_upload_bootblock(struct snd_card *card) int ret; ret = request_firmware(&init_fw, "scope.cod", card->dev); - if (ret < 0) { - snd_printk(KERN_ERR "sscape: Error loading scope.cod"); + if (ret) return ret; - } ret = upload_dma_data(sscape, init_fw->data, init_fw->size); release_firmware(init_fw); @@ -571,11 +569,8 @@ static int sscape_upload_microcode(struct snd_card *card, int version) snprintf(name, sizeof(name), "sndscape.co%d", version); err = request_firmware(&init_fw, name, card->dev); - if (err < 0) { - snd_printk(KERN_ERR "sscape: Error loading sndscape.co%d", - version); + if (err) return err; - } err = upload_dma_data(sscape, init_fw->data, init_fw->size); if (err == 0) snd_printk(KERN_INFO "sscape: MIDI firmware loaded %zu KBs\n", diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index aec1c46e669..5db9b7b9ef3 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c @@ -1954,10 +1954,8 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path) const struct firmware *firmware; err = request_firmware(&firmware, path, dev->card->dev); - if (err < 0) { - snd_printk(KERN_ERR "firmware (%s) download failed!!!\n", path); + if (err) return 1; - } len = 0; buf = firmware->data; diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c index 9acc0ac75ec..7c1ebc8ec8e 100644 --- a/sound/pci/asihpi/hpidspcd.c +++ b/sound/pci/asihpi/hpidspcd.c @@ -35,8 +35,6 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, err = request_firmware(&firmware, fw_name, &dev->dev); if (err || !firmware) { - dev_err(&dev->dev, "%d, request_firmware failed for %s\n", - err, fw_name); goto error1; } if (firmware->size < sizeof(header)) { diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 5b888b795f7..27ea5c56fb5 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -3241,11 +3241,8 @@ int snd_cs46xx_start_dsp(struct snd_cs46xx *chip) #ifdef CONFIG_SND_CS46XX_NEW_DSP for (i = 0; i < CS46XX_DSP_MODULES; i++) { err = load_firmware(chip, &chip->modules[i], module_names[i]); - if (err < 0) { - dev_err(chip->card->dev, "firmware load error [%s]\n", - module_names[i]); + if (err < 0) return err; - } err = cs46xx_dsp_load_module(chip, chip->modules[i]); if (err < 0) { dev_err(chip->card->dev, "image download error [%s]\n", diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index b612a536a5a..2a35c47fc6b 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -48,11 +48,8 @@ static int get_firmware(const struct firmware **fw_entry, "firmware requested: %s\n", card_fw[fw_index].data); snprintf(name, sizeof(name), "ea/%s", card_fw[fw_index].data); err = request_firmware(fw_entry, name, &chip->pci->dev); - if (err < 0) - dev_err(chip->card->dev, - "get_firmware(): Firmware not available (%d)\n", err); #ifdef CONFIG_PM_SLEEP - else + if (!err) chip->fw_cache[fw_index] = *fw_entry; #endif return err; diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 8c1e968b9c9..a95c405b8d8 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -873,10 +873,8 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) dev_info(emu->card->dev, "emu1010: EMU_HANA_ID = 0x%x\n", reg); err = snd_emu1010_load_firmware(emu, 0, &emu->firmware); - if (err < 0) { - dev_info(emu->card->dev, "emu1010: Loading Firmware failed\n"); + if (err < 0) return err; - } /* ID, should read & 0x7f = 0x55 when FPGA programmed. */ snd_emu1010_fpga_read(emu, EMU_HANA_ID, ®); diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5732c31c416..2b55956ed60 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1966,10 +1966,8 @@ static void azx_firmware_cb(const struct firmware *fw, void *context) struct azx *chip = card->private_data; struct pci_dev *pci = chip->pci; - if (!fw) { - dev_err(card->dev, "Cannot load firmware, aborting\n"); + if (!fw) goto error; - } chip->fw = fw; if (!chip->disabled) { diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 0d81eac0a47..bd96550086b 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -2332,7 +2332,6 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev); if (err < 0) { - snd_printk(KERN_ERR "firmware not available\n"); snd_korg1212_free(korg1212); return err; } diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c index 92b051c6572..d63a6ab12d8 100644 --- a/sound/pci/mixart/mixart_hwdep.c +++ b/sound/pci/mixart/mixart_hwdep.c @@ -558,11 +558,8 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr) for (i = 0; i < 3; i++) { sprintf(path, "mixart/%s", fw_files[i]); - if (request_firmware(&fw_entry, path, &mgr->pci->dev)) { - dev_err(&mgr->pci->dev, - "miXart: can't load firmware %s\n", path); + if (request_firmware(&fw_entry, path, &mgr->pci->dev)) return -ENOENT; - } /* fake hwdep dsp record */ err = mixart_dsp_load(mgr, i, fw_entry); release_firmware(fw_entry); diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index 12a6bdb920b..16e2695a77e 100644 --- a/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/sound/pci/pcxhr/pcxhr_hwdep.c @@ -372,12 +372,8 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr) if (!fw_files[fw_set][i]) continue; sprintf(path, "pcxhr/%s", fw_files[fw_set][i]); - if (request_firmware(&fw_entry, path, &mgr->pci->dev)) { - dev_err(&mgr->pci->dev, - "pcxhr: can't load firmware %s\n", - path); + if (request_firmware(&fw_entry, path, &mgr->pci->dev)) return -ENOENT; - } /* fake hwdep dsp record */ err = pcxhr_dsp_load(mgr, i, fw_entry); release_firmware(fw_entry); diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 58771ae0ed6..bbc7b1cf344 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1216,11 +1216,8 @@ static int try_to_load_firmware(struct cmdif *cif, struct snd_riptide *chip) if (!chip->fw_entry) { err = request_firmware(&chip->fw_entry, "riptide.hex", &chip->pci->dev); - if (err) { - snd_printk(KERN_ERR - "Riptide: Firmware not available %d\n", err); + if (err) return -EIO; - } } err = loadfirmware(cif, chip->fw_entry->data, chip->fw_entry->size); if (err) { diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 5cbdc9be9c7..bc5c620f01e 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -5117,11 +5117,8 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp) return -EINVAL; } - if (request_firmware(&fw, fwfile, &hdsp->pci->dev)) { - dev_err(hdsp->card->dev, - "cannot load firmware %s\n", fwfile); + if (request_firmware(&fw, fwfile, &hdsp->pci->dev)) return -ENOENT; - } if (fw->size < HDSP_FIRMWARE_SIZE) { dev_err(hdsp->card->dev, "too short firmware size %d (expected %d)\n", diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 72e165cc644..d73cc2abdb9 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -894,10 +894,8 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, } ret = request_firmware(&fw, filename, &i2c->dev); - if (ret != 0) { - dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret); + if (ret != 0) goto err_supplies; - } /* Pre-cook the concatenation of the register address onto the image */ wm2000->anc_download_size = fw->size + 2; diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c index 69137c14d0d..f410bd6f839 100644 --- a/sound/usb/6fire/firmware.c +++ b/sound/usb/6fire/firmware.c @@ -215,8 +215,6 @@ static int usb6fire_fw_ezusb_upload( ret = request_firmware(&fw, fwname, &device->dev); if (ret < 0) { kfree(rec); - dev_err(&intf->dev, - "error requesting ezusb firmware %s.\n", fwname); return ret; } ret = usb6fire_fw_ihex_init(fw, rec); @@ -292,8 +290,6 @@ static int usb6fire_fw_fpga_upload( ret = request_firmware(&fw, fwname, &device->dev); if (ret < 0) { - dev_err(&intf->dev, "unable to get fpga firmware %s.\n", - fwname); kfree(buffer); return -EIO; } -- 2.30.2