summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-05-22 18:30:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 07:20:51 -0300
commit18658117ff844e8117f6b363cb7fa8c5f8ad2cb8 (patch)
tree0588a927374c7d5ed4d4bff117dd5203ef54342a /drivers/media
parent854470606070d91955f03a7dca3a8024fc2a2540 (diff)
downloadblackbird-op-linux-18658117ff844e8117f6b363cb7fa8c5f8ad2cb8.tar.gz
blackbird-op-linux-18658117ff844e8117f6b363cb7fa8c5f8ad2cb8.zip
V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/siano/smscoreapi.c56
-rw-r--r--drivers/media/dvb/siano/smsdvb.c24
-rw-r--r--drivers/media/dvb/siano/smsusb.c40
3 files changed, 60 insertions, 60 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index d3ba1fcde54a..e55138e6627a 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -285,7 +285,7 @@ smscore_buffer_t *smscore_createbuffer(u8* buffer, void* common_buffer, dma_addr
smscore_buffer_t *cb = kmalloc(sizeof(smscore_buffer_t), GFP_KERNEL);
if (!cb)
{
- printk(KERN_INFO "%s kmalloc(...) failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s kmalloc(...) failed\n", __func__);
return NULL;
}
@@ -313,7 +313,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored
dev = kzalloc(sizeof(smscore_device_t), GFP_KERNEL);
if (!dev)
{
- printk(KERN_INFO "%s kzalloc(...) failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s kzalloc(...) failed\n", __func__);
return -ENOMEM;
}
@@ -359,7 +359,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored
smscore_putbuffer(dev, cb);
}
- printk(KERN_INFO "%s allocated %d buffers\n", __FUNCTION__, dev->num_buffers);
+ printk(KERN_INFO "%s allocated %d buffers\n", __func__, dev->num_buffers);
dev->mode = DEVICE_MODE_NONE;
dev->context = params->context;
@@ -380,7 +380,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored
*coredev = dev;
- printk(KERN_INFO "%s device %p created\n", __FUNCTION__, dev);
+ printk(KERN_INFO "%s device %p created\n", __func__, dev);
return 0;
}
@@ -402,7 +402,7 @@ int smscore_start_device(smscore_device_t *coredev)
rc = smscore_notify_callbacks(coredev, coredev->device, 1);
- printk(KERN_INFO "%s device %p started, rc %d\n", __FUNCTION__, coredev, rc);
+ printk(KERN_INFO "%s device %p started, rc %d\n", __func__, coredev, rc);
kmutex_unlock(&g_smscore_deviceslock);
@@ -526,7 +526,7 @@ int smscore_load_firmware(smscore_device_t *coredev, char* filename, loadfirmwar
rc = request_firmware(&fw, filename, coredev->device);
if (rc < 0)
{
- printk(KERN_INFO "%s failed to open \"%s\"\n", __FUNCTION__, filename);
+ printk(KERN_INFO "%s failed to open \"%s\"\n", __func__, filename);
return rc;
}
@@ -543,7 +543,7 @@ int smscore_load_firmware(smscore_device_t *coredev, char* filename, loadfirmwar
}
else
{
- printk(KERN_INFO "%s failed to allocate firmware buffer\n", __FUNCTION__);
+ printk(KERN_INFO "%s failed to allocate firmware buffer\n", __func__);
rc = -ENOMEM;
}
@@ -583,11 +583,11 @@ void smscore_unregister_device(smscore_device_t *coredev)
if (num_buffers == coredev->num_buffers)
break;
- printk(KERN_INFO "%s waiting for %d buffer(s)\n", __FUNCTION__, coredev->num_buffers - num_buffers);
+ printk(KERN_INFO "%s waiting for %d buffer(s)\n", __func__, coredev->num_buffers - num_buffers);
msleep(100);
}
- printk(KERN_INFO "%s freed %d buffers\n", __FUNCTION__, num_buffers);
+ printk(KERN_INFO "%s freed %d buffers\n", __func__, num_buffers);
if (coredev->common_buffer)
dma_free_coherent(NULL, coredev->common_buffer_size, coredev->common_buffer, coredev->common_buffer_phys);
@@ -597,7 +597,7 @@ void smscore_unregister_device(smscore_device_t *coredev)
kmutex_unlock(&g_smscore_deviceslock);
- printk(KERN_INFO "%s device %p destroyed\n", __FUNCTION__, coredev);
+ printk(KERN_INFO "%s device %p destroyed\n", __func__, coredev);
}
int smscore_detect_mode(smscore_device_t *coredev)
@@ -614,14 +614,14 @@ int smscore_detect_mode(smscore_device_t *coredev)
rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done);
if (rc == -ETIME)
{
- printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed first try\n", __FUNCTION__);
+ printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed first try\n", __func__);
if (wait_for_completion_timeout(&coredev->resume_done, msecs_to_jiffies(5000)))
{
rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done);
if (rc < 0)
{
- printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d\n", __FUNCTION__, rc);
+ printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d\n", __func__, rc);
}
}
else
@@ -664,7 +664,7 @@ int smscore_set_device_mode(smscore_device_t *coredev, int mode)
{
if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_RAW_TUNER)
{
- printk(KERN_INFO "%s invalid mode specified %d\n", __FUNCTION__, mode);
+ printk(KERN_INFO "%s invalid mode specified %d\n", __func__, mode);
return -EINVAL;
}
@@ -677,7 +677,7 @@ int smscore_set_device_mode(smscore_device_t *coredev, int mode)
if (coredev->mode == mode)
{
- printk(KERN_INFO "%s device mode %d already set\n", __FUNCTION__, mode);
+ printk(KERN_INFO "%s device mode %d already set\n", __func__, mode);
return 0;
}
@@ -689,7 +689,7 @@ int smscore_set_device_mode(smscore_device_t *coredev, int mode)
}
else
{
- printk(KERN_INFO "%s mode %d supported by running firmware\n", __FUNCTION__, mode);
+ printk(KERN_INFO "%s mode %d supported by running firmware\n", __func__, mode);
}
buffer = kmalloc(sizeof(SmsMsgData_ST) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);
@@ -834,7 +834,7 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
case MSG_SMS_GET_VERSION_EX_RES:
{
SmsVersionRes_ST *ver = (SmsVersionRes_ST*) phdr;
- printk("%s: MSG_SMS_GET_VERSION_EX_RES id %d prots 0x%x ver %d.%d\n", __FUNCTION__, ver->FirmwareId, ver->SupportedProtocols, ver->RomVersionMajor, ver->RomVersionMinor);
+ printk("%s: MSG_SMS_GET_VERSION_EX_RES id %d prots 0x%x ver %d.%d\n", __func__, ver->FirmwareId, ver->SupportedProtocols, ver->RomVersionMajor, ver->RomVersionMinor);
coredev->mode = ver->FirmwareId == 255 ? DEVICE_MODE_NONE : ver->FirmwareId;
coredev->modes_supported = ver->SupportedProtocols;
@@ -844,12 +844,12 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
}
case MSG_SMS_INIT_DEVICE_RES:
- printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __FUNCTION__);
+ printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __func__);
complete(&coredev->init_device_done);
break;
case MSG_SW_RELOAD_START_RES:
- printk("%s: MSG_SW_RELOAD_START_RES\n", __FUNCTION__);
+ printk("%s: MSG_SW_RELOAD_START_RES\n", __func__);
complete(&coredev->reload_start_done);
break;
@@ -858,11 +858,11 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
break;
case MSG_SW_RELOAD_EXEC_RES:
- printk("%s: MSG_SW_RELOAD_EXEC_RES\n", __FUNCTION__);
+ printk("%s: MSG_SW_RELOAD_EXEC_RES\n", __func__);
break;
case MSG_SMS_SWDOWNLOAD_TRIGGER_RES:
- printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n", __FUNCTION__);
+ printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n", __func__);
complete(&coredev->trigger_done);
break;
@@ -871,7 +871,7 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
break;
default:
- printk(KERN_INFO "%s no client (%p) or error (%d), type:%d dstid:%d\n", __FUNCTION__, client, rc, phdr->msgType, phdr->msgDstId);
+ printk(KERN_INFO "%s no client (%p) or error (%d), type:%d dstid:%d\n", __func__, client, rc, phdr->msgType, phdr->msgDstId);
}
smscore_putbuffer(coredev, cb);
@@ -986,7 +986,7 @@ int smscore_register_client(smscore_device_t *coredev, smsclient_params_t *param
*client = newclient;
- printk(KERN_INFO "%s %p %d %d\n", __FUNCTION__, params->context, params->data_type, params->initial_id);
+ printk(KERN_INFO "%s %p %d %d\n", __func__, params->context, params->data_type, params->initial_id);
return 0;
}
@@ -1019,7 +1019,7 @@ void smscore_unregister_client(smscore_client_t *client)
}
}
- printk(KERN_INFO "%s %p %d\n", __FUNCTION__, client->context, client->data_type);
+ printk(KERN_INFO "%s %p %d\n", __func__, client->context, client->data_type);
list_del(&client->entry);
kfree(client);
@@ -1076,19 +1076,19 @@ int smscore_map_common_buffer(smscore_device_t *coredev, struct vm_area_struct *
if (!(vma->vm_flags & (VM_READ | VM_SHARED)) || (vma->vm_flags & VM_WRITE))
{
- printk(KERN_INFO "%s invalid vm flags\n", __FUNCTION__);
+ printk(KERN_INFO "%s invalid vm flags\n", __func__);
return -EINVAL;
}
if ((end - start) != size)
{
- printk(KERN_INFO "%s invalid size %d expected %d\n", __FUNCTION__, (int)(end - start), (int) size);
+ printk(KERN_INFO "%s invalid size %d expected %d\n", __func__, (int)(end - start), (int) size);
return -EINVAL;
}
if (remap_pfn_range(vma, start, coredev->common_buffer_phys >> PAGE_SHIFT, size, pgprot_noncached(vma->vm_page_prot)))
{
- printk(KERN_INFO "%s remap_page_range failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s remap_page_range failed\n", __func__);
return -EAGAIN;
}
@@ -1112,7 +1112,7 @@ int smscore_module_init(void)
/* DVB Register */
rc = smsdvb_register();
- printk(KERN_INFO "%s, rc %d\n", __FUNCTION__, rc);
+ printk(KERN_INFO "%s, rc %d\n", __func__, rc);
return rc;
}
@@ -1146,7 +1146,7 @@ void smscore_module_exit(void)
/* Unregister USB */
smsusb_unregister();
- printk(KERN_INFO "%s\n", __FUNCTION__);
+ printk(KERN_INFO "%s\n", __func__);
}
module_init(smscore_module_init);
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index e1a14a812c25..1a75033c35de 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -107,7 +107,7 @@ static int smsdvb_start_feed(struct dvb_demux_feed *feed)
smsdvb_client_t *client = container_of(feed->demux, smsdvb_client_t, demux);
SmsMsgData_ST PidMsg;
- printk("%s add pid %d(%x)\n", __FUNCTION__, feed->pid, feed->pid);
+ printk("%s add pid %d(%x)\n", __func__, feed->pid, feed->pid);
PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -124,7 +124,7 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed)
smsdvb_client_t *client = container_of(feed->demux, smsdvb_client_t, demux);
SmsMsgData_ST PidMsg;
- printk("%s remove pid %d(%x)\n", __FUNCTION__, feed->pid, feed->pid);
+ printk("%s remove pid %d(%x)\n", __func__, feed->pid, feed->pid);
PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -197,7 +197,7 @@ static int smsdvb_read_snr(struct dvb_frontend *fe, u16 *snr)
static int smsdvb_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune)
{
- printk("%s\n", __FUNCTION__);
+ printk("%s\n", __func__);
tune->min_delay_ms = 400;
tune->step_size = 250000;
@@ -223,7 +223,7 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_para
Msg.Data[0] = fep->frequency;
Msg.Data[2] = 12000000;
- printk("%s freq %d band %d\n", __FUNCTION__, fep->frequency, fep->u.ofdm.bandwidth);
+ printk("%s freq %d band %d\n", __func__, fep->frequency, fep->u.ofdm.bandwidth);
switch(fep->u.ofdm.bandwidth)
{
@@ -242,7 +242,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_para
{
smsdvb_client_t *client = container_of(fe, smsdvb_client_t, frontend);
- printk("%s\n", __FUNCTION__);
+ printk("%s\n", __func__);
// todo:
memcpy(fep, &client->fe_params, sizeof(struct dvb_frontend_parameters));
@@ -303,7 +303,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival
client = kzalloc(sizeof(smsdvb_client_t), GFP_KERNEL);
if (!client)
{
- printk(KERN_INFO "%s kmalloc() failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s kmalloc() failed\n", __func__);
return -ENOMEM;
}
@@ -325,7 +325,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival
rc = dvb_dmx_init(&client->demux);
if (rc < 0)
{
- printk("%s dvb_dmx_init failed %d\n\n", __FUNCTION__, rc);
+ printk("%s dvb_dmx_init failed %d\n\n", __func__, rc);
goto dvbdmx_error;
}
@@ -337,7 +337,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival
rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter);
if (rc < 0)
{
- printk("%s dvb_dmxdev_init failed %d\n", __FUNCTION__, rc);
+ printk("%s dvb_dmxdev_init failed %d\n", __func__, rc);
goto dmxdev_error;
}
@@ -347,7 +347,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival
rc = dvb_register_frontend(&client->adapter, &client->frontend);
if (rc < 0)
{
- printk("%s frontend registration failed %d\n", __FUNCTION__, rc);
+ printk("%s frontend registration failed %d\n", __func__, rc);
goto frontend_error;
}
@@ -360,7 +360,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival
rc = smscore_register_client(coredev, &params, &client->smsclient);
if (rc < 0)
{
- printk(KERN_INFO "%s smscore_register_client() failed %d\n", __FUNCTION__, rc);
+ printk(KERN_INFO "%s smscore_register_client() failed %d\n", __func__, rc);
goto client_error;
}
@@ -375,7 +375,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival
kmutex_unlock(&g_smsdvb_clientslock);
- printk(KERN_INFO "%s success\n", __FUNCTION__);
+ printk(KERN_INFO "%s success\n", __func__);
return 0;
@@ -405,7 +405,7 @@ int smsdvb_register(void)
rc = smscore_register_hotplug(smsdvb_hotplug);
- printk(KERN_INFO "%s\n", __FUNCTION__);
+ printk(KERN_INFO "%s\n", __func__);
return rc;
}
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 20aa878d9d5f..e15f0342d069 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -62,7 +62,7 @@ void smsusb_onresponse(struct urb *urb)
if (urb->status < 0)
{
- printk(KERN_INFO "%s error, urb status %d, %d bytes\n", __FUNCTION__, urb->status, urb->actual_length);
+ printk(KERN_INFO "%s error, urb status %d, %d bytes\n", __func__, urb->status, urb->actual_length);
return;
}
@@ -81,7 +81,7 @@ void smsusb_onresponse(struct urb *urb)
// sanity check
if (((int) phdr->msgLength + surb->cb->offset) > urb->actual_length)
{
- printk("%s: invalid response msglen %d offset %d size %d\n", __FUNCTION__, phdr->msgLength, surb->cb->offset, urb->actual_length);
+ printk("%s: invalid response msglen %d offset %d size %d\n", __func__, phdr->msgLength, surb->cb->offset, urb->actual_length);
goto exit_and_resubmit;
}
@@ -96,7 +96,7 @@ void smsusb_onresponse(struct urb *urb)
}
else
{
- printk("%s invalid response msglen %d actual %d\n", __FUNCTION__, phdr->msgLength, urb->actual_length);
+ printk("%s invalid response msglen %d actual %d\n", __func__, phdr->msgLength, urb->actual_length);
}
}
@@ -111,7 +111,7 @@ int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb)
surb->cb = smscore_getbuffer(dev->coredev);
if (!surb->cb)
{
- printk(KERN_INFO "%s smscore_getbuffer(...) returned NULL\n", __FUNCTION__);
+ printk(KERN_INFO "%s smscore_getbuffer(...) returned NULL\n", __func__);
return -ENOMEM;
}
}
@@ -156,7 +156,7 @@ int smsusb_start_streaming(smsusb_device_t* dev)
rc = smsusb_submit_urb(dev, &dev->surbs[i]);
if (rc < 0)
{
- printk(KERN_INFO "%s smsusb_submit_urb(...) failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s smsusb_submit_urb(...) failed\n", __func__);
smsusb_stop_streaming(dev);
break;
}
@@ -190,14 +190,14 @@ int smsusb1_load_firmware(struct usb_device *udev, int id)
if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA)
{
- printk(KERN_INFO "%s invalid firmware id specified %d\n", __FUNCTION__, id);
+ printk(KERN_INFO "%s invalid firmware id specified %d\n", __func__, id);
return -EINVAL;
}
rc = request_firmware(&fw, smsusb1_fw_lkup[id], &udev->dev);
if (rc < 0)
{
- printk(KERN_INFO "%s failed to open \"%s\" mode %d\n", __FUNCTION__, smsusb1_fw_lkup[id], id);
+ printk(KERN_INFO "%s failed to open \"%s\" mode %d\n", __func__, smsusb1_fw_lkup[id], id);
return rc;
}
@@ -208,7 +208,7 @@ int smsusb1_load_firmware(struct usb_device *udev, int id)
rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), fw_buffer, fw->size, &dummy, 1000);
- printk(KERN_INFO "%s: sent %d(%d) bytes, rc %d\n", __FUNCTION__, fw->size, dummy, rc);
+ printk(KERN_INFO "%s: sent %d(%d) bytes, rc %d\n", __func__, fw->size, dummy, rc);
kfree(fw_buffer);
}
@@ -232,7 +232,7 @@ void smsusb1_detectmode(void *context, int *mode)
if (!product_string)
{
product_string = "none";
- printk("%s product string not found\n", __FUNCTION__);
+ printk("%s product string not found\n", __func__);
}
else
{
@@ -246,7 +246,7 @@ void smsusb1_detectmode(void *context, int *mode)
*mode = 2;
}
- printk("%s: %d \"%s\"\n", __FUNCTION__, *mode, product_string);
+ printk("%s: %d \"%s\"\n", __func__, *mode, product_string);
}
int smsusb1_setmode(void *context, int mode)
@@ -255,7 +255,7 @@ int smsusb1_setmode(void *context, int mode)
if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA)
{
- printk(KERN_INFO "%s invalid firmware id specified %d\n", __FUNCTION__, mode);
+ printk(KERN_INFO "%s invalid firmware id specified %d\n", __func__, mode);
return -EINVAL;
}
@@ -276,7 +276,7 @@ void smsusb_term_device(struct usb_interface *intf)
kfree(dev);
- printk(KERN_INFO "%s device %p destroyed\n", __FUNCTION__, dev);
+ printk(KERN_INFO "%s device %p destroyed\n", __func__, dev);
}
usb_set_intfdata(intf, NULL);
@@ -292,7 +292,7 @@ int smsusb_init_device(struct usb_interface *intf)
dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL);
if (!dev)
{
- printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n", __func__);
return -ENOMEM;
}
@@ -328,7 +328,7 @@ int smsusb_init_device(struct usb_interface *intf)
rc = smscore_register_device(&params, &dev->coredev);
if (rc < 0)
{
- printk(KERN_INFO "%s smscore_register_device(...) failed, rc %d\n", __FUNCTION__, rc);
+ printk(KERN_INFO "%s smscore_register_device(...) failed, rc %d\n", __func__, rc);
smsusb_term_device(intf);
return rc;
}
@@ -343,7 +343,7 @@ int smsusb_init_device(struct usb_interface *intf)
rc = smsusb_start_streaming(dev);
if (rc < 0)
{
- printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n", __func__);
smsusb_term_device(intf);
return rc;
}
@@ -351,12 +351,12 @@ int smsusb_init_device(struct usb_interface *intf)
rc = smscore_start_device(dev->coredev);
if (rc < 0)
{
- printk(KERN_INFO "%s smscore_start_device(...) failed\n", __FUNCTION__);
+ printk(KERN_INFO "%s smscore_start_device(...) failed\n", __func__);
smsusb_term_device(intf);
return rc;
}
- printk(KERN_INFO "%s device %p created\n", __FUNCTION__, dev);
+ printk(KERN_INFO "%s device %p created\n", __func__, dev);
return rc;
}
@@ -372,7 +372,7 @@ int smsusb_probe(struct usb_interface *intf, const struct usb_device_id *id)
rc = usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 0);
if (rc < 0)
{
- printk(KERN_INFO "%s usb_set_interface failed, rc %d\n", __FUNCTION__, rc);
+ printk(KERN_INFO "%s usb_set_interface failed, rc %d\n", __func__, rc);
return rc;
}
}
@@ -422,7 +422,7 @@ int smsusb_register(void)
if (rc)
printk(KERN_INFO "usb_register failed. Error number %d\n", rc);
- printk(KERN_INFO "%s\n", __FUNCTION__);
+ printk(KERN_INFO "%s\n", __func__);
return rc;
}
@@ -431,6 +431,6 @@ void smsusb_unregister(void)
{
/* Regular USB Cleanup */
usb_deregister(&smsusb_driver);
- printk(KERN_INFO "%s\n", __FUNCTION__);
+ printk(KERN_INFO "%s\n", __func__);
}
OpenPOWER on IntegriCloud