Commit b412284b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: emi26.c: remove err() usage

err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68980793
...@@ -78,18 +78,14 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -78,18 +78,14 @@ static int emi26_load_firmware (struct usb_device *dev)
const struct firmware *bitstream_fw = NULL; const struct firmware *bitstream_fw = NULL;
const struct firmware *firmware_fw = NULL; const struct firmware *firmware_fw = NULL;
const struct ihex_binrec *rec; const struct ihex_binrec *rec;
int err; int err = -ENOMEM;
int i; int i;
__u32 addr; /* Address to write */ __u32 addr; /* Address to write */
__u8 *buf; __u8 *buf;
buf = kmalloc(FW_LOAD_SIZE, GFP_KERNEL); buf = kmalloc(FW_LOAD_SIZE, GFP_KERNEL);
if (!buf) { if (!buf)
dev_err(&dev->dev, "%s - error loading firmware: error = %d\n",
__func__, -ENOMEM);
err = -ENOMEM;
goto wraperr; goto wraperr;
}
err = request_ihex_firmware(&loader_fw, "emi26/loader.fw", &dev->dev); err = request_ihex_firmware(&loader_fw, "emi26/loader.fw", &dev->dev);
if (err) if (err)
...@@ -111,11 +107,8 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -111,11 +107,8 @@ static int emi26_load_firmware (struct usb_device *dev)
/* Assert reset (stop the CPU in the EMI) */ /* Assert reset (stop the CPU in the EMI) */
err = emi26_set_reset(dev,1); err = emi26_set_reset(dev,1);
if (err < 0) { if (err < 0)
dev_err(&dev->dev,"%s - error loading firmware: error = %d\n",
__func__, err);
goto wraperr; goto wraperr;
}
rec = (const struct ihex_binrec *)loader_fw->data; rec = (const struct ihex_binrec *)loader_fw->data;
/* 1. We need to put the loader for the FPGA into the EZ-USB */ /* 1. We need to put the loader for the FPGA into the EZ-USB */
...@@ -123,19 +116,15 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -123,19 +116,15 @@ static int emi26_load_firmware (struct usb_device *dev)
err = emi26_writememory(dev, be32_to_cpu(rec->addr), err = emi26_writememory(dev, be32_to_cpu(rec->addr),
rec->data, be16_to_cpu(rec->len), rec->data, be16_to_cpu(rec->len),
ANCHOR_LOAD_INTERNAL); ANCHOR_LOAD_INTERNAL);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
rec = ihex_next_binrec(rec); rec = ihex_next_binrec(rec);
} }
/* De-assert reset (let the CPU run) */ /* De-assert reset (let the CPU run) */
err = emi26_set_reset(dev,0); err = emi26_set_reset(dev,0);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
msleep(250); /* let device settle */ msleep(250); /* let device settle */
/* 2. We upload the FPGA firmware into the EMI /* 2. We upload the FPGA firmware into the EMI
...@@ -153,18 +142,14 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -153,18 +142,14 @@ static int emi26_load_firmware (struct usb_device *dev)
rec = ihex_next_binrec(rec); rec = ihex_next_binrec(rec);
} }
err = emi26_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA); err = emi26_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
} while (rec); } while (rec);
/* Assert reset (stop the CPU in the EMI) */ /* Assert reset (stop the CPU in the EMI) */
err = emi26_set_reset(dev,1); err = emi26_set_reset(dev,1);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
/* 3. We need to put the loader for the firmware into the EZ-USB (again...) */ /* 3. We need to put the loader for the firmware into the EZ-USB (again...) */
for (rec = (const struct ihex_binrec *)loader_fw->data; for (rec = (const struct ihex_binrec *)loader_fw->data;
...@@ -172,19 +157,15 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -172,19 +157,15 @@ static int emi26_load_firmware (struct usb_device *dev)
err = emi26_writememory(dev, be32_to_cpu(rec->addr), err = emi26_writememory(dev, be32_to_cpu(rec->addr),
rec->data, be16_to_cpu(rec->len), rec->data, be16_to_cpu(rec->len),
ANCHOR_LOAD_INTERNAL); ANCHOR_LOAD_INTERNAL);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
} }
msleep(250); /* let device settle */ msleep(250); /* let device settle */
/* De-assert reset (let the CPU run) */ /* De-assert reset (let the CPU run) */
err = emi26_set_reset(dev,0); err = emi26_set_reset(dev,0);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
/* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */ /* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */
...@@ -194,19 +175,15 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -194,19 +175,15 @@ static int emi26_load_firmware (struct usb_device *dev)
err = emi26_writememory(dev, be32_to_cpu(rec->addr), err = emi26_writememory(dev, be32_to_cpu(rec->addr),
rec->data, be16_to_cpu(rec->len), rec->data, be16_to_cpu(rec->len),
ANCHOR_LOAD_EXTERNAL); ANCHOR_LOAD_EXTERNAL);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
} }
} }
/* Assert reset (stop the CPU in the EMI) */ /* Assert reset (stop the CPU in the EMI) */
err = emi26_set_reset(dev,1); err = emi26_set_reset(dev,1);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
for (rec = (const struct ihex_binrec *)firmware_fw->data; for (rec = (const struct ihex_binrec *)firmware_fw->data;
rec; rec = ihex_next_binrec(rec)) { rec; rec = ihex_next_binrec(rec)) {
...@@ -214,19 +191,15 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -214,19 +191,15 @@ static int emi26_load_firmware (struct usb_device *dev)
err = emi26_writememory(dev, be32_to_cpu(rec->addr), err = emi26_writememory(dev, be32_to_cpu(rec->addr),
rec->data, be16_to_cpu(rec->len), rec->data, be16_to_cpu(rec->len),
ANCHOR_LOAD_INTERNAL); ANCHOR_LOAD_INTERNAL);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
} }
} }
/* De-assert reset (let the CPU run) */ /* De-assert reset (let the CPU run) */
err = emi26_set_reset(dev,0); err = emi26_set_reset(dev,0);
if (err < 0) { if (err < 0)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr; goto wraperr;
}
msleep(250); /* let device settle */ msleep(250); /* let device settle */
/* return 1 to fail the driver inialization /* return 1 to fail the driver inialization
...@@ -234,6 +207,10 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -234,6 +207,10 @@ static int emi26_load_firmware (struct usb_device *dev)
err = 1; err = 1;
wraperr: wraperr:
if (err < 0)
dev_err(&dev->dev,"%s - error loading firmware: error = %d\n",
__func__, err);
release_firmware(loader_fw); release_firmware(loader_fw);
release_firmware(bitstream_fw); release_firmware(bitstream_fw);
release_firmware(firmware_fw); release_firmware(firmware_fw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment