[kernel] r22350 - dists/trunk/linux/debian/patches/bugfix/all
Maximilian Attems
maks at moszumanska.debian.org
Sun Feb 8 19:05:12 UTC 2015
Author: maks
Date: Sun Feb 8 19:05:12 2015
New Revision: 22350
Log:
first go at those firmware messages
TODO: fixup more..
Signed-off-by: maximilian attems <maks at debian.org>
Modified:
dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Sun Feb 8 12:26:35 2015 (r22349)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Sun Feb 8 19:05:12 2015 (r22350)
@@ -203,12 +203,13 @@
fw->size, fw_name);
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
-@@ -1286,10 +1286,8 @@ static void sdma_load_firmware(const str
+@@ -1287,11 +1287,8 @@ static void sdma_load_firmware(const str
const struct sdma_script_start_addrs *addr;
unsigned short *ram_code;
- if (!fw) {
-- dev_err(sdma->dev, "firmware not found\n");
+- dev_info(sdma->dev, "external firmware not found, using ROM firmware\n");
+- /* In this case we just use the ROM firmware. */
+ if (!fw)
return;
- }
@@ -924,20 +925,22 @@
}
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
-@@ -995,12 +995,8 @@ static int cx231xx_load_firmware(struct
+@@ -995,14 +995,8 @@ static int cx231xx_load_firmware(struct
retval = request_firmware(&firmware, CX231xx_FIRM_IMAGE_NAME,
- &dev->udev->dev);
+ dev->dev);
- if (retval != 0) {
-- pr_err("ERROR: Hotplug firmware request failed (%s).\n",
+- dev_err(dev->dev,
+- "ERROR: Hotplug firmware request failed (%s).\n",
- CX231xx_FIRM_IMAGE_NAME);
-- pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n");
+- dev_err(dev->dev,
+- "Please fix your hotplug setup, the board will not work without firmware loaded!\n");
+ if (retval != 0)
return -1;
- }
if (firmware->size != CX231xx_FIRM_IMAGE_SIZE) {
- pr_err("ERROR: Firmware size mismatch (have %zd, expected %d)\n",
+ dev_err(dev->dev,
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -931,14 +931,8 @@ static int cx23885_load_firmware(struct
@@ -973,9 +976,9 @@
release_firmware(fw);
--- a/drivers/media/i2c/cx25840/cx25840-firmware.c
+++ b/drivers/media/i2c/cx25840/cx25840-firmware.c
-@@ -127,10 +127,8 @@ int cx25840_loadfw(struct i2c_client *cl
- MAX_BUF_SIZE = 16; /* cx231xx cannot accept more than 16 bytes at a time */
- }
+@@ -126,10 +126,8 @@ int cx25840_loadfw(struct i2c_client *cl
+ 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);
@@ -987,21 +990,20 @@
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
-@@ -448,13 +448,8 @@ static int blackbird_load_firmware(struc
+@@ -444,12 +444,8 @@ static int blackbird_load_firmware(struc
&dev->pci->dev);
- if (retval != 0) {
-- dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
+- pr_err("Hotplug firmware request failed (%s).\n",
- CX2341X_FIRM_ENC_FILENAME);
-- dprintk(0, "Please fix your hotplug setup, the board will "
-- "not work without firmware loaded!\n");
+- pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n");
+ if (retval != 0)
- return -1;
+ return -EIO;
- }
if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
- dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
+ pr_err("Firmware size mismatch (have %zd, expected %d)\n",
--- a/drivers/media/usb/gspca/vicam.c
+++ b/drivers/media/usb/gspca/vicam.c
@@ -244,10 +244,8 @@ static int sd_init(struct gspca_dev *gsp
@@ -1102,8 +1104,8 @@
printk(KERN_INFO "%s() firmware read %Zu bytes.\n",
__func__, fw->size);
---- a/drivers/media/usb/tlg2300/pd-main.c
-+++ b/drivers/media/usb/tlg2300/pd-main.c
+--- a/drivers/staging/media/tlg2300/pd-main.c
++++ b/drivers/staging/media/tlg2300/pd-main.c
@@ -219,10 +219,8 @@ static int firmware_download(struct usb_
size_t max_packet_size;
@@ -1159,7 +1161,7 @@
return err;
- }
- image_data = (u8 *) typhoon_fw->data;
+ image_data = typhoon_fw->data;
remaining = typhoon_fw->size;
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -1580,9 +1582,9 @@
else
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
-@@ -1010,13 +1010,8 @@ static void iwl_req_fw_callback(const st
-
- memset(&pieces, 0, sizeof(pieces));
+@@ -1096,13 +1096,8 @@ static void iwl_req_fw_callback(const st
+ if (!pieces)
+ return;
- if (!ucode_raw) {
- if (drv->fw_index <= api_ok)
@@ -2041,19 +2043,19 @@
fw->size, fwname);
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
-@@ -2231,16 +2231,12 @@ struct net_device *init_ft1000_card(stru
+@@ -2152,16 +2152,12 @@ struct net_device *init_ft1000_card(stru
info->AsicID = ft1000_read_reg(dev, FT1000_REG_ASIC_ID);
if (info->AsicID == ELECTRABUZZ_ID) {
- DEBUG(0, "ft1000_hw: ELECTRABUZZ ASIC\n");
+ pr_debug("ELECTRABUZZ ASIC\n");
- if (request_firmware(&fw_entry, "ft1000.img", &link->dev) != 0) {
-- printk(KERN_INFO "ft1000: Could not open ft1000.img\n");
+- pr_info("Could not open ft1000.img\n");
+ if (request_firmware(&fw_entry, "ft1000.img", &link->dev) != 0)
goto err_unreg;
- }
} else {
- DEBUG(0, "ft1000_hw: MAGNEMITE ASIC\n");
+ pr_debug("MAGNEMITE ASIC\n");
- if (request_firmware(&fw_entry, "ft2000.img", &link->dev) != 0) {
-- printk(KERN_INFO "ft1000: Could not open ft2000.img\n");
+- pr_info("Could not open ft2000.img\n");
+ if (request_firmware(&fw_entry, "ft2000.img", &link->dev) != 0)
goto err_unreg;
- }
@@ -2063,11 +2065,11 @@
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -137,10 +137,8 @@ static int ft1000_probe(struct usb_inter
- ft1000dev->bulk_out_endpointAddr);
+ ft1000dev->bulk_out_endpointAddr);
ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev);
- if (ret < 0) {
-- pr_err("Error request_firmware().\n");
+- pr_err("Error request_firmware()\n");
+ if (ret)
goto err_fw;
- }
More information about the Kernel-svn-changes
mailing list