USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
14722ef4ac
commit
441b62c1ed
@ -70,8 +70,8 @@ static int emi26_writememory (struct usb_device *dev, int address, unsigned char
|
||||
static int emi26_set_reset (struct usb_device *dev, unsigned char reset_bit)
|
||||
{
|
||||
int response;
|
||||
info("%s - %d", __FUNCTION__, reset_bit);
|
||||
/* printk(KERN_DEBUG "%s - %d", __FUNCTION__, reset_bit); */
|
||||
info("%s - %d", __func__, reset_bit);
|
||||
/* printk(KERN_DEBUG "%s - %d", __func__, reset_bit); */
|
||||
response = emi26_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0);
|
||||
if (response < 0) {
|
||||
err("emi26: set_reset (%d) failed", reset_bit);
|
||||
@ -91,7 +91,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
|
||||
buf = kmalloc(FW_LOAD_SIZE, GFP_KERNEL);
|
||||
if (!buf) {
|
||||
err( "%s - error loading firmware: error = %d", __FUNCTION__, -ENOMEM);
|
||||
err( "%s - error loading firmware: error = %d", __func__, -ENOMEM);
|
||||
err = -ENOMEM;
|
||||
goto wraperr;
|
||||
}
|
||||
@ -99,7 +99,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
/* Assert reset (stop the CPU in the EMI) */
|
||||
err = emi26_set_reset(dev,1);
|
||||
if (err < 0) {
|
||||
err( "%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err( "%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
|
||||
@ -107,7 +107,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
for (i=0; g_Loader[i].type == 0; i++) {
|
||||
err = emi26_writememory(dev, g_Loader[i].address, g_Loader[i].data, g_Loader[i].length, ANCHOR_LOAD_INTERNAL);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
}
|
||||
@ -115,7 +115,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
/* De-assert reset (let the CPU run) */
|
||||
err = emi26_set_reset(dev,0);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
msleep(250); /* let device settle */
|
||||
@ -135,7 +135,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
}
|
||||
err = emi26_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
} while (i > 0);
|
||||
@ -143,7 +143,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
/* Assert reset (stop the CPU in the EMI) */
|
||||
err = emi26_set_reset(dev,1);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
|
||||
@ -151,7 +151,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
for (i=0; g_Loader[i].type == 0; i++) {
|
||||
err = emi26_writememory(dev, g_Loader[i].address, g_Loader[i].data, g_Loader[i].length, ANCHOR_LOAD_INTERNAL);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
}
|
||||
@ -160,7 +160,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
/* De-assert reset (let the CPU run) */
|
||||
err = emi26_set_reset(dev,0);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
|
||||
@ -169,7 +169,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
if (!INTERNAL_RAM(g_Firmware[i].address)) {
|
||||
err = emi26_writememory(dev, g_Firmware[i].address, g_Firmware[i].data, g_Firmware[i].length, ANCHOR_LOAD_EXTERNAL);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
}
|
||||
@ -178,7 +178,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
/* Assert reset (stop the CPU in the EMI) */
|
||||
err = emi26_set_reset(dev,1);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
|
||||
@ -186,7 +186,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
if (INTERNAL_RAM(g_Firmware[i].address)) {
|
||||
err = emi26_writememory(dev, g_Firmware[i].address, g_Firmware[i].data, g_Firmware[i].length, ANCHOR_LOAD_INTERNAL);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
}
|
||||
@ -195,7 +195,7 @@ static int emi26_load_firmware (struct usb_device *dev)
|
||||
/* De-assert reset (let the CPU run) */
|
||||
err = emi26_set_reset(dev,0);
|
||||
if (err < 0) {
|
||||
err("%s - error loading firmware: error = %d", __FUNCTION__, err);
|
||||
err("%s - error loading firmware: error = %d", __func__, err);
|
||||
goto wraperr;
|
||||
}
|
||||
msleep(250); /* let device settle */
|
||||
@ -221,7 +221,7 @@ static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *i
|
||||
{
|
||||
struct usb_device *dev = interface_to_usbdev(intf);
|
||||
|
||||
info("%s start", __FUNCTION__);
|
||||
info("%s start", __func__);
|
||||
|
||||
emi26_load_firmware(dev);
|
||||
|
||||
|
Reference in New Issue
Block a user