The patch number 8293 was added via Michael Krufky <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Michael Krufky <[EMAIL PROTECTED]>
sms1xxx: create printk macros
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/siano/smscoreapi.c | 167 ++++++++++-----------
linux/drivers/media/dvb/siano/smscoreapi.h | 5
linux/drivers/media/dvb/siano/smsdvb.c | 46 ++---
linux/drivers/media/dvb/siano/smsusb.c | 108 ++++++-------
4 files changed, 165 insertions(+), 161 deletions(-)
diff -r ee4c3560865d -r 7dabf139fca5 linux/drivers/media/dvb/siano/smscoreapi.c
--- a/linux/drivers/media/dvb/siano/smscoreapi.c Wed Jun 18 18:09:55
2008 -0400
+++ b/linux/drivers/media/dvb/siano/smscoreapi.c Wed Jun 18 21:15:46
2008 -0400
@@ -34,16 +34,16 @@
#include "smscoreapi.h"
#define PERROR(fmt, args...)\
- printk(KERN_ERR "smscore error: line %d- %s(): " fmt, \
+ sms_err("smscore error: line %d- %s(): " fmt, \
__LINE__, __func__, ## args)
#ifdef SMSCORE_DEBUG
#undef PWARNING
-# define PWARNING(fmt, args...) printk(KERN_INFO "smscore warning: " \
+# define PWARNING(fmt, args...) sms_info("smscore warning: " \
"line %d- %s(): " fmt, \
__LINE__, __func__, ## args)
#undef PDEBUG /* undef it, just in case */
-# define PDEBUG(fmt, args...) printk(KERN_INFO "smscore - %s(): " fmt, \
+# define PDEBUG(fmt, args...) sms_info("smscore - %s(): " fmt, \
__func__, ## args)
#else /*SMSCORE_DEBUG*/
#define PDEBUG(fmt, args...)
@@ -157,8 +157,8 @@ static struct smscore_registry_entry_t *
strcpy(entry->devpath, devpath);
list_add(&entry->entry, &g_smscore_registry);
} else
- printk(KERN_ERR "%s failed to create smscore_registry.\n",
- __func__);
+ sms_err("%s failed to create smscore_registry.\n",
+ __func__);
kmutex_unlock(&g_smscore_registrylock);
return entry;
}
@@ -171,7 +171,7 @@ int smscore_registry_getmode(char *devpa
if (entry)
return entry->mode;
else
- printk(KERN_ERR "%s No registry found.\n", __func__);
+ sms_err("%s No registry found.\n", __func__);
return default_mode;
}
@@ -184,7 +184,7 @@ enum sms_device_type_st smscore_registry
if (entry)
return entry->type;
else
- printk(KERN_ERR "%s No registry found.\n", __func__);
+ sms_err("%s No registry found.\n", __func__);
return -1;
}
@@ -197,7 +197,7 @@ void smscore_registry_setmode(char *devp
if (entry)
entry->mode = mode;
else
- printk(KERN_ERR "%s No registry found.\n", __func__);
+ sms_err("%s No registry found.\n", __func__);
}
void smscore_registry_settype(char *devpath, enum sms_device_type_st type)
@@ -208,7 +208,7 @@ void smscore_registry_settype(char *devp
if (entry)
entry->type = type;
else
- printk(KERN_ERR "%s No registry found.\n", __func__);
+ sms_err("%s No registry found.\n", __func__);
}
@@ -331,7 +331,7 @@ struct smscore_buffer_t *smscore_createb
struct smscore_buffer_t *cb =
kmalloc(sizeof(struct smscore_buffer_t), GFP_KERNEL);
if (!cb) {
- printk(KERN_INFO "%s kmalloc(...) failed\n", __func__);
+ sms_info("%s kmalloc(...) failed\n", __func__);
return NULL;
}
@@ -360,7 +360,7 @@ int smscore_register_device(struct smsde
dev = kzalloc(sizeof(struct smscore_device_t), GFP_KERNEL);
if (!dev) {
- printk(KERN_INFO "%s kzalloc(...) failed\n", __func__);
+ sms_info("%s kzalloc(...) failed\n", __func__);
return -ENOMEM;
}
@@ -408,8 +408,8 @@ int smscore_register_device(struct smsde
smscore_putbuffer(dev, cb);
}
- printk(KERN_INFO "%s allocated %d buffers\n",
- __func__, dev->num_buffers);
+ sms_info("%s allocated %d buffers\n",
+ __func__, dev->num_buffers);
dev->mode = DEVICE_MODE_NONE;
dev->context = params->context;
@@ -432,7 +432,7 @@ int smscore_register_device(struct smsde
*coredev = dev;
- printk(KERN_INFO "%s device %p created\n", __func__, dev);
+ sms_info("%s device %p created\n", __func__, dev);
return 0;
}
@@ -450,8 +450,8 @@ int smscore_start_device(struct smscore_
int rc = smscore_set_device_mode(
coredev, smscore_registry_getmode(coredev->devpath));
if (rc < 0) {
- printk(KERN_INFO "%s set device mode faile , rc %d\n",
- __func__, rc);
+ sms_info("%s set device mode faile , rc %d\n",
+ __func__, rc);
return rc;
}
@@ -459,8 +459,8 @@ int smscore_start_device(struct smscore_
rc = smscore_notify_callbacks(coredev, coredev->device, 1);
- printk(KERN_INFO "%s device %p started, rc %d\n",
- __func__, coredev, rc);
+ sms_info("%s device %p started, rc %d\n",
+ __func__, coredev, rc);
kmutex_unlock(&g_smscore_deviceslock);
@@ -472,8 +472,8 @@ int smscore_sendrequest_and_wait(struct
{
int rc = coredev->sendrequest_handler(coredev->context, buffer, size);
if (rc < 0) {
- printk(KERN_INFO "%s sendrequest returned error %d\n",
- __func__, rc);
+ sms_info("%s sendrequest returned error %d\n",
+ __func__, rc);
return rc;
}
@@ -491,8 +491,8 @@ int smscore_load_firmware_family2(struct
u8 *payload = firmware->Payload;
int rc = 0;
- printk(KERN_INFO "%s loading FW to addr 0x%x size %d\n",
- __func__, mem_address, firmware->Length);
+ sms_info("%s loading FW to addr 0x%x size %d\n",
+ __func__, mem_address, firmware->Length);
if (coredev->preload_handler) {
rc = coredev->preload_handler(coredev->context);
if (rc < 0)
@@ -578,8 +578,8 @@ int smscore_load_firmware_family2(struct
msleep(500);
}
- printk(KERN_DEBUG "%s rc=%d, postload=%p \n", __func__, rc,
- coredev->postload_handler);
+ sms_debug("%s rc=%d, postload=%p \n", __func__, rc,
+ coredev->postload_handler);
kfree(msg);
@@ -612,12 +612,12 @@ int smscore_load_firmware_from_file(stru
rc = request_firmware(&fw, filename, coredev->device);
if (rc < 0) {
- printk(KERN_INFO "%s failed to open \"%s\"\n",
- __func__, filename);
+ sms_info("%s failed to open \"%s\"\n",
+ __func__, filename);
return rc;
}
- printk(KERN_INFO "%s read FW %s, size=%d\"\n", __func__,
- filename, fw->size);
+ sms_info("%s read FW %s, size=%d\"\n", __func__,
+ filename, fw->size);
fw_buffer = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT),
GFP_KERNEL | GFP_DMA);
if (fw_buffer) {
@@ -632,8 +632,8 @@ int smscore_load_firmware_from_file(stru
kfree(fw_buffer);
} else {
- printk(KERN_INFO "%s failed to allocate firmware buffer\n",
- __func__);
+ sms_info("%s failed to allocate firmware buffer\n",
+ __func__);
rc = -ENOMEM;
}
@@ -680,17 +680,17 @@ void smscore_unregister_device(struct sm
if (num_buffers == coredev->num_buffers)
break;
if (++retry > 10) {
- printk(KERN_INFO "%s exiting although "
- "not all buffers released.\n", __func__);
+ sms_info("%s exiting although "
+ "not all buffers released.\n", __func__);
break;
}
- printk(KERN_INFO "%s waiting for %d buffer(s)\n", __func__,
- coredev->num_buffers - num_buffers);
+ sms_info("%s waiting for %d buffer(s)\n", __func__,
+ coredev->num_buffers - num_buffers);
msleep(100);
}
- printk(KERN_INFO "%s freed %d buffers\n", __func__, num_buffers);
+ sms_info("%s freed %d buffers\n", __func__, num_buffers);
if (coredev->common_buffer)
dma_free_coherent(NULL, coredev->common_buffer_size,
@@ -702,7 +702,7 @@ void smscore_unregister_device(struct sm
kmutex_unlock(&g_smscore_deviceslock);
- printk(KERN_INFO "%s device %p destroyed\n", __func__, coredev);
+ sms_info("%s device %p destroyed\n", __func__, coredev);
}
int smscore_detect_mode(struct smscore_device_t *coredev)
@@ -722,8 +722,8 @@ int smscore_detect_mode(struct smscore_d
rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength,
&coredev->version_ex_done);
if (rc == -ETIME) {
- printk(KERN_ERR "%s: MSG_SMS_GET_VERSION_EX_REQ "
- "failed first try\n", __func__);
+ sms_err("%s: MSG_SMS_GET_VERSION_EX_REQ "
+ "failed first try\n", __func__);
if (wait_for_completion_timeout(&coredev->resume_done,
msecs_to_jiffies(5000))) {
@@ -731,9 +731,9 @@ int smscore_detect_mode(struct smscore_d
coredev, msg, msg->msgLength,
&coredev->version_ex_done);
if (rc < 0)
- printk(KERN_ERR "%s: "
- "MSG_SMS_GET_VERSION_EX_REQ failed "
- "second try, rc %d\n", __func__, rc);
+ sms_err("%s: "
+ "MSG_SMS_GET_VERSION_EX_REQ failed "
+ "second try, rc %d\n", __func__, rc);
} else
rc = -ETIME;
}
@@ -783,8 +783,8 @@ int smscore_set_device_mode(struct smsco
PDEBUG("set device mode to %d\n", mode);
if (coredev->device_flags & SMS_DEVICE_FAMILY2) {
if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_RAW_TUNER) {
- printk(KERN_INFO "%s invalid mode specified %d\n",
- __func__, mode);
+ sms_info("%s invalid mode specified %d\n",
+ __func__, mode);
return -EINVAL;
}
@@ -793,15 +793,15 @@ int smscore_set_device_mode(struct smsco
if (!(coredev->device_flags & SMS_DEVICE_NOT_READY)) {
rc = smscore_detect_mode(coredev);
if (rc < 0) {
- printk(KERN_INFO "%s mode detect failed %d\n",
- __func__, rc);
+ sms_info("%s mode detect failed %d\n",
+ __func__, rc);
return rc;
}
}
if (coredev->mode == mode) {
- printk(KERN_INFO "%s device mode %d already set\n",
- __func__, mode);
+ sms_info("%s device mode %d already set\n",
+ __func__, mode);
return 0;
}
@@ -810,13 +810,13 @@ int smscore_set_device_mode(struct smsco
rc = smscore_load_firmware_from_file(
coredev, smscore_fw_lkup[mode][type], NULL);
if (rc < 0) {
- printk(KERN_INFO "%s load firmware "
- "failed %d\n", __func__, rc);
+ sms_info("%s load firmware "
+ "failed %d\n", __func__, rc);
return rc;
}
} else
- printk(KERN_INFO "%s mode %d supported by running "
- "firmware\n", __func__, mode);
+ sms_info("%s mode %d supported by running "
+ "firmware\n", __func__, mode);
buffer = kmalloc(sizeof(struct SmsMsgData_ST) +
SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);
@@ -835,14 +835,14 @@ int smscore_set_device_mode(struct smsco
kfree(buffer);
} else {
- printk(KERN_INFO "%s Could not allocate buffer for "
- "init device message.\n", __func__);
+ sms_info("%s Could not allocate buffer for "
+ "init device message.\n", __func__);
rc = -ENOMEM;
}
} else {
if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) {
- printk(KERN_INFO "%s invalid mode specified %d\n",
- __func__, mode);
+ sms_info("%s invalid mode specified %d\n",
+ __func__, mode);
return -EINVAL;
}
@@ -862,7 +862,7 @@ int smscore_set_device_mode(struct smsco
}
if (rc != 0)
- printk(KERN_INFO "%s return error code %d.\n", __func__, rc);
+ sms_info("%s return error code %d.\n", __func__, rc);
return rc;
}
@@ -946,9 +946,9 @@ void smscore_onresponse(struct smscore_d
last_sample_time = time_now;
if (time_now - last_sample_time > 10000) {
- printk(KERN_DEBUG "\n%s data rate %d bytes/secs\n", __func__,
- (int)((data_total * 1000) /
- (time_now - last_sample_time)));
+ sms_debug("\n%s data rate %d bytes/secs\n", __func__,
+ (int)((data_total * 1000) /
+ (time_now - last_sample_time)));
last_sample_time = time_now;
data_total = 0;
@@ -971,10 +971,10 @@ void smscore_onresponse(struct smscore_d
{
struct SmsVersionRes_ST *ver =
(struct SmsVersionRes_ST *) phdr;
- printk(KERN_DEBUG "%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);
+ sms_debug("%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;
@@ -984,26 +984,25 @@ void smscore_onresponse(struct smscore_d
break;
}
case MSG_SMS_INIT_DEVICE_RES:
- printk(KERN_DEBUG "%s: MSG_SMS_INIT_DEVICE_RES\n",
- __func__);
+ sms_debug("%s: MSG_SMS_INIT_DEVICE_RES\n",
+ __func__);
complete(&coredev->init_device_done);
break;
case MSG_SW_RELOAD_START_RES:
- printk(KERN_DEBUG "%s: MSG_SW_RELOAD_START_RES\n",
- __func__);
+ sms_debug("%s: MSG_SW_RELOAD_START_RES\n",
+ __func__);
complete(&coredev->reload_start_done);
break;
case MSG_SMS_DATA_DOWNLOAD_RES:
complete(&coredev->data_download_done);
break;
case MSG_SW_RELOAD_EXEC_RES:
- printk(KERN_DEBUG "%s: MSG_SW_RELOAD_EXEC_RES\n",
- __func__);
+ sms_debug("%s: MSG_SW_RELOAD_EXEC_RES\n",
+ __func__);
break;
case MSG_SMS_SWDOWNLOAD_TRIGGER_RES:
- printk(KERN_DEBUG
- "%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n",
- __func__);
+ sms_debug("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n",
+ __func__);
complete(&coredev->trigger_done);
break;
case MSG_SMS_SLEEP_RESUME_COMP_IND:
@@ -1011,9 +1010,9 @@ void smscore_onresponse(struct smscore_d
break;
default:
#if 0
- printk(KERN_INFO "%s no client (%p) or error (%d), "
- "type:%d dstid:%d\n", __func__, client, rc,
- phdr->msgType, phdr->msgDstId);
+ sms_info("%s no client (%p) or error (%d), "
+ "type:%d dstid:%d\n", __func__, client, rc,
+ phdr->msgType, phdr->msgDstId);
#endif
break;
}
@@ -1161,7 +1160,7 @@ void smscore_unregister_client(struct sm
kfree(identry);
}
- printk(KERN_INFO "%s %p\n", __func__, client->context);
+ sms_info("%s %p\n", __func__, client->context);
list_del(&client->entry);
kfree(client);
@@ -1188,7 +1187,7 @@ int smsclient_sendrequest(struct smscore
int rc;
if (client == NULL) {
- printk(KERN_ERR "%s Got NULL client\n", __func__);
+ sms_err("%s Got NULL client\n", __func__);
return -EINVAL;
}
@@ -1196,7 +1195,7 @@ int smsclient_sendrequest(struct smscore
/* check that no other channel with same id exists */
if (coredev == NULL) {
- printk(KERN_ERR "%s Got NULL coredev\n", __func__);
+ sms_err("%s Got NULL coredev\n", __func__);
return -EINVAL;
}
@@ -1237,20 +1236,20 @@ int smscore_map_common_buffer(struct sms
if (!(vma->vm_flags & (VM_READ | VM_SHARED)) ||
(vma->vm_flags & VM_WRITE)) {
- printk(KERN_INFO "%s invalid vm flags\n", __func__);
+ sms_info("%s invalid vm flags\n", __func__);
return -EINVAL;
}
if ((end - start) != size) {
- printk(KERN_INFO "%s invalid size %d expected %d\n",
- __func__, (int)(end - start), (int) size);
+ sms_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", __func__);
+ sms_info("%s remap_page_range failed\n", __func__);
return -EAGAIN;
}
@@ -1274,7 +1273,7 @@ int smscore_module_init(void)
/* DVB Register */
rc = smsdvb_register();
- printk(KERN_INFO "%s, rc %d\n", __func__, rc);
+ sms_info("%s, rc %d\n", __func__, rc);
return rc;
}
@@ -1310,7 +1309,7 @@ void smscore_module_exit(void)
/* Unregister USB */
smsusb_unregister();
- printk(KERN_INFO "%s\n", __func__);
+ sms_info("%s\n", __func__);
}
module_init(smscore_module_init);
diff -r ee4c3560865d -r 7dabf139fca5 linux/drivers/media/dvb/siano/smscoreapi.h
--- a/linux/drivers/media/dvb/siano/smscoreapi.h Wed Jun 18 18:09:55
2008 -0400
+++ b/linux/drivers/media/dvb/siano/smscoreapi.h Wed Jun 18 21:15:46
2008 -0400
@@ -579,4 +579,9 @@ int smsusb_register(void);
int smsusb_register(void);
void smsusb_unregister(void);
+#define sms_err(fmt, arg...) printk(KERN_ERR fmt, ##arg)
+#define sms_info(fmt, arg...) printk(KERN_INFO fmt, ##arg)
+#define sms_debug(fmt, arg...) printk(KERN_DEBUG fmt, ##arg)
+
+
#endif /* __smscoreapi_h__ */
diff -r ee4c3560865d -r 7dabf139fca5 linux/drivers/media/dvb/siano/smsdvb.c
--- a/linux/drivers/media/dvb/siano/smsdvb.c Wed Jun 18 18:09:55 2008 -0400
+++ b/linux/drivers/media/dvb/siano/smsdvb.c Wed Jun 18 21:15:46 2008 -0400
@@ -113,8 +113,8 @@ static int smsdvb_start_feed(struct dvb_
container_of(feed->demux, struct smsdvb_client_t, demux);
struct SmsMsgData_ST PidMsg;
- printk(KERN_DEBUG "%s add pid %d(%x)\n", __func__,
- feed->pid, feed->pid);
+ sms_debug("%s add pid %d(%x)\n", __func__,
+ feed->pid, feed->pid);
PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -133,8 +133,8 @@ static int smsdvb_stop_feed(struct dvb_d
container_of(feed->demux, struct smsdvb_client_t, demux);
struct SmsMsgData_ST PidMsg;
- printk(KERN_DEBUG "%s remove pid %d(%x)\n", __func__,
- feed->pid, feed->pid);
+ sms_debug("%s remove pid %d(%x)\n", __func__,
+ feed->pid, feed->pid);
PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -220,7 +220,7 @@ static int smsdvb_get_tune_settings(stru
static int smsdvb_get_tune_settings(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *tune)
{
- printk(KERN_DEBUG "%s\n", __func__);
+ sms_debug("%s\n", __func__);
tune->min_delay_ms = 400;
tune->step_size = 250000;
@@ -247,8 +247,8 @@ static int smsdvb_set_frontend(struct dv
Msg.Data[0] = fep->frequency;
Msg.Data[2] = 12000000;
- printk(KERN_DEBUG "%s freq %d band %d\n", __func__,
- fep->frequency, fep->u.ofdm.bandwidth);
+ sms_debug("%s freq %d band %d\n", __func__,
+ fep->frequency, fep->u.ofdm.bandwidth);
switch (fep->u.ofdm.bandwidth) {
case BANDWIDTH_8_MHZ: Msg.Data[1] = BW_8_MHZ; break;
@@ -271,7 +271,7 @@ static int smsdvb_get_frontend(struct dv
struct smsdvb_client_t *client =
container_of(fe, struct smsdvb_client_t, frontend);
- printk(KERN_DEBUG "%s\n", __func__);
+ sms_debug("%s\n", __func__);
/* todo: */
memcpy(fep, &client->fe_params,
@@ -326,8 +326,8 @@ int smsdvb_hotplug(struct smscore_device
if (smscore_get_device_mode(coredev) != 4) {
#if 1 /* new siano drop (1.2.17) does this -- yuck */
- printk(KERN_ERR "%sSMS Device mode is not set for "
- "DVB operation.\n", __func__);
+ sms_err("%sSMS Device mode is not set for "
+ "DVB operation.\n", __func__);
return 0;
#else
rc = smscore_set_device_mode(coredev, 4);
@@ -338,7 +338,7 @@ int smsdvb_hotplug(struct smscore_device
client = kzalloc(sizeof(struct smsdvb_client_t), GFP_KERNEL);
if (!client) {
- printk(KERN_INFO "%s kmalloc() failed\n", __func__);
+ sms_info("%s kmalloc() failed\n", __func__);
return -ENOMEM;
}
@@ -348,8 +348,8 @@ int smsdvb_hotplug(struct smscore_device
smscore_get_board_id(coredev))->name,
THIS_MODULE, device, adapter_nr);
if (rc < 0) {
- printk(KERN_ERR "%s dvb_register_adapter() failed %d\n",
- __func__, rc);
+ sms_err("%s dvb_register_adapter() failed %d\n",
+ __func__, rc);
goto adapter_error;
}
@@ -362,8 +362,8 @@ int smsdvb_hotplug(struct smscore_device
rc = dvb_dmx_init(&client->demux);
if (rc < 0) {
- printk(KERN_ERR "%s dvb_dmx_init failed %d\n\n",
- __func__, rc);
+ sms_err("%s dvb_dmx_init failed %d\n\n",
+ __func__, rc);
goto dvbdmx_error;
}
@@ -374,8 +374,8 @@ int smsdvb_hotplug(struct smscore_device
rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter);
if (rc < 0) {
- printk(KERN_ERR "%s dvb_dmxdev_init failed %d\n",
- __func__, rc);
+ sms_err("%s dvb_dmxdev_init failed %d\n",
+ __func__, rc);
goto dmxdev_error;
}
@@ -385,8 +385,8 @@ int smsdvb_hotplug(struct smscore_device
rc = dvb_register_frontend(&client->adapter, &client->frontend);
if (rc < 0) {
- printk(KERN_ERR "%s frontend registration failed %d\n",
- __func__, rc);
+ sms_err("%s frontend registration failed %d\n",
+ __func__, rc);
goto frontend_error;
}
@@ -398,8 +398,8 @@ int smsdvb_hotplug(struct smscore_device
rc = smscore_register_client(coredev, ¶ms, &client->smsclient);
if (rc < 0) {
- printk(KERN_INFO "%s smscore_register_client() failed %d\n",
- __func__, rc);
+ sms_info("%s smscore_register_client() failed %d\n",
+ __func__, rc);
goto client_error;
}
@@ -414,7 +414,7 @@ int smsdvb_hotplug(struct smscore_device
kmutex_unlock(&g_smsdvb_clientslock);
- printk(KERN_INFO "%s success\n", __func__);
+ sms_info("%s success\n", __func__);
return 0;
@@ -444,7 +444,7 @@ int smsdvb_register(void)
rc = smscore_register_hotplug(smsdvb_hotplug);
- printk(KERN_INFO "%s\n", __func__);
+ sms_info("%s\n", __func__);
return rc;
}
diff -r ee4c3560865d -r 7dabf139fca5 linux/drivers/media/dvb/siano/smsusb.c
--- a/linux/drivers/media/dvb/siano/smsusb.c Wed Jun 18 18:09:55 2008 -0400
+++ b/linux/drivers/media/dvb/siano/smsusb.c Wed Jun 18 21:15:46 2008 -0400
@@ -64,8 +64,8 @@ void smsusb_onresponse(struct urb *urb,
struct smsusb_device_t *dev = surb->dev;
if (urb->status < 0) {
- printk(KERN_INFO "%s error, urb status %d, %d bytes\n",
- __func__, urb->status, urb->actual_length);
+ sms_info("%s error, urb status %d, %d bytes\n",
+ __func__, urb->status, urb->actual_length);
return;
}
@@ -85,12 +85,12 @@ void smsusb_onresponse(struct urb *urb,
/* sanity check */
if (((int) phdr->msgLength +
surb->cb->offset) > urb->actual_length) {
- printk(KERN_INFO "%s: invalid "
- "response msglen %d offset %d "
- "size %d\n", __func__,
- phdr->msgLength,
- surb->cb->offset,
- urb->actual_length);
+ sms_info("%s: invalid response "
+ "msglen %d offset %d "
+ "size %d\n", __func__,
+ phdr->msgLength,
+ surb->cb->offset,
+ urb->actual_length);
goto exit_and_resubmit;
}
@@ -104,9 +104,9 @@ void smsusb_onresponse(struct urb *urb,
smscore_onresponse(dev->coredev, surb->cb);
surb->cb = NULL;
} else {
- printk(KERN_INFO "%s invalid response "
- "msglen %d actual %d\n", __func__,
- phdr->msgLength, urb->actual_length);
+ sms_info("%s invalid response "
+ "msglen %d actual %d\n", __func__,
+ phdr->msgLength, urb->actual_length);
}
}
@@ -119,8 +119,8 @@ int smsusb_submit_urb(struct smsusb_devi
if (!surb->cb) {
surb->cb = smscore_getbuffer(dev->coredev);
if (!surb->cb) {
- printk(KERN_INFO "%s smscore_getbuffer(...) "
- "returned NULL\n", __func__);
+ sms_info("%s smscore_getbuffer(...) "
+ "returned NULL\n", __func__);
return -ENOMEM;
}
}
@@ -161,8 +161,8 @@ int smsusb_start_streaming(struct smsusb
for (i = 0; i < MAX_URBS; i++) {
rc = smsusb_submit_urb(dev, &dev->surbs[i]);
if (rc < 0) {
- printk(KERN_INFO "%s smsusb_submit_urb(...) "
- "failed\n", __func__);
+ sms_info("%s smsusb_submit_urb(...) "
+ "failed\n", __func__);
smsusb_stop_streaming(dev);
break;
}
@@ -195,15 +195,15 @@ int smsusb1_load_firmware(struct usb_dev
int rc, dummy;
if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) {
- printk(KERN_INFO "%s invalid firmware id specified %d\n",
- __func__, id);
+ sms_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",
- __func__, smsusb1_fw_lkup[id], id);
+ sms_info("%s failed to open \"%s\" mode %d\n",
+ __func__, smsusb1_fw_lkup[id], id);
return rc;
}
@@ -214,12 +214,12 @@ int smsusb1_load_firmware(struct usb_dev
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",
- __func__, fw->size, dummy, rc);
+ sms_info("%s: sent %d(%d) bytes, rc %d\n",
+ __func__, fw->size, dummy, rc);
kfree(fw_buffer);
} else {
- printk(KERN_INFO "failed to allocate firmware buffer\n");
+ sms_info("failed to allocate firmware buffer\n");
rc = -ENOMEM;
}
@@ -237,7 +237,7 @@ void smsusb1_detectmode(void *context, i
if (!product_string) {
product_string = "none";
- printk(KERN_ERR "%s product string not found\n", __func__);
+ sms_err("%s product string not found\n", __func__);
} else if (strstr(product_string, "DVBH"))
*mode = 1;
else if (strstr(product_string, "BDA"))
@@ -247,7 +247,7 @@ void smsusb1_detectmode(void *context, i
else if (strstr(product_string, "TDMB"))
*mode = 2;
- printk(KERN_INFO "%s: %d \"%s\"\n", __func__, *mode, product_string);
+ sms_info("%s: %d \"%s\"\n", __func__, *mode, product_string);
}
int smsusb1_setmode(void *context, int mode)
@@ -256,8 +256,8 @@ int smsusb1_setmode(void *context, int m
sizeof(struct SmsMsgHdr_ST), 0 };
if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) {
- printk(KERN_INFO "%s invalid firmware id specified %d\n",
- __func__, mode);
+ sms_info("%s invalid firmware id specified %d\n",
+ __func__, mode);
return -EINVAL;
}
@@ -278,7 +278,7 @@ void smsusb_term_device(struct usb_inter
kfree(dev);
- printk(KERN_INFO "%s device %p destroyed\n", __func__, dev);
+ sms_info("%s device %p destroyed\n", __func__, dev);
}
usb_set_intfdata(intf, NULL);
@@ -294,8 +294,8 @@ int smsusb_init_device(struct usb_interf
/* create device object */
dev = kzalloc(sizeof(struct smsusb_device_t), GFP_KERNEL);
if (!dev) {
- printk(KERN_INFO "%s kzalloc(sizeof(struct smsusb_device_t) "
- "failed\n", __func__);
+ sms_info("%s kzalloc(sizeof(struct smsusb_device_t) "
+ "failed\n", __func__);
return -ENOMEM;
}
@@ -313,25 +313,25 @@ int smsusb_init_device(struct usb_interf
params.setmode_handler = smsusb1_setmode;
params.detectmode_handler = smsusb1_detectmode;
params.device_type = SMS_STELLAR;
- printk(KERN_INFO "%s stellar device found\n", __func__);
+ sms_info("%s stellar device found\n", __func__);
break;
default:
switch (board->type) {
case SMS_NOVA_A0:
params.device_type = SMS_NOVA_A0;
- printk(KERN_INFO "%s nova A0 found\n", __func__);
+ sms_info("%s nova A0 found\n", __func__);
break;
case SMS_NOVA_B0:
params.device_type = SMS_NOVA_B0;
- printk(KERN_INFO "%s nova B0 found\n", __func__);
+ sms_info("%s nova B0 found\n", __func__);
break;
case SMS_VEGA:
params.device_type = SMS_VEGA;
- printk(KERN_INFO "%s Vega found\n", __func__);
+ sms_info("%s Vega found\n", __func__);
break;
default:
- printk(KERN_ERR "%s Unspecified sms device type!\n",
- __func__);
+ sms_err("%s Unspecified sms device type!\n",
+ __func__);
}
dev->buffer_size = USB2_BUFFER_SIZE;
@@ -354,8 +354,8 @@ int smsusb_init_device(struct usb_interf
/* register in smscore */
rc = smscore_register_device(¶ms, &dev->coredev);
if (rc < 0) {
- printk(KERN_INFO "%s smscore_register_device(...) failed, "
- "rc %d\n", __func__, rc);
+ sms_info("%s smscore_register_device(...) failed, "
+ "rc %d\n", __func__, rc);
smsusb_term_device(intf);
return rc;
}
@@ -368,24 +368,24 @@ int smsusb_init_device(struct usb_interf
usb_init_urb(&dev->surbs[i].urb);
}
- printk(KERN_INFO "%s smsusb_start_streaming(...).\n", __func__);
+ sms_info("%s smsusb_start_streaming(...).\n", __func__);
rc = smsusb_start_streaming(dev);
if (rc < 0) {
- printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n",
- __func__);
+ sms_info("%s smsusb_start_streaming(...) failed\n",
+ __func__);
smsusb_term_device(intf);
return rc;
}
rc = smscore_start_device(dev->coredev);
if (rc < 0) {
- printk(KERN_INFO "%s smscore_start_device(...) failed\n",
- __func__);
+ sms_info("%s smscore_start_device(...) failed\n",
+ __func__);
smsusb_term_device(intf);
return rc;
}
- printk(KERN_INFO "%s device %p created\n", __func__, dev);
+ sms_info("%s device %p created\n", __func__, dev);
return rc;
}
@@ -403,36 +403,36 @@ int smsusb_probe(struct usb_interface *i
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", __func__, rc);
+ sms_info("%s usb_set_interface failed, "
+ "rc %d\n", __func__, rc);
return rc;
}
}
- printk(KERN_INFO "smsusb_probe %d\n",
+ sms_info("smsusb_probe %d\n",
intf->cur_altsetting->desc.bInterfaceNumber);
for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++)
- printk(KERN_INFO "endpoint %d %02x %02x %d\n", i,
+ sms_info("endpoint %d %02x %02x %d\n", i,
intf->cur_altsetting->endpoint[i].desc.bEndpointAddress,
intf->cur_altsetting->endpoint[i].desc.bmAttributes,
intf->cur_altsetting->endpoint[i].desc.wMaxPacketSize);
if ((udev->actconfig->desc.bNumInterfaces == 2) &&
(intf->cur_altsetting->desc.bInterfaceNumber == 0)) {
- printk(KERN_INFO "rom interface 0 is not used\n");
+ sms_info("rom interface 0 is not used\n");
return -ENODEV;
}
if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {
snprintf(devpath, sizeof(devpath), "usb\\%d-%s",
udev->bus->busnum, udev->devpath);
- printk(KERN_INFO "stellar device was found.\n");
+ sms_info("stellar device was found.\n");
return smsusb1_load_firmware(
udev, smscore_registry_getmode(devpath));
}
rc = smsusb_init_device(intf, id->driver_info);
- printk(KERN_INFO "%s rc %d\n", __func__, rc);
+ sms_info("%s rc %d\n", __func__, rc);
return rc;
}
@@ -452,16 +452,16 @@ int smsusb_register(void)
{
int rc = usb_register(&smsusb_driver);
if (rc)
- printk(KERN_INFO "usb_register failed. Error number %d\n", rc);
-
- printk(KERN_INFO "%s\n", __func__);
+ sms_info("usb_register failed. Error number %d\n", rc);
+
+ sms_info("%s\n", __func__);
return rc;
}
void smsusb_unregister(void)
{
- printk(KERN_DEBUG "%s\n", __func__);
+ sms_debug("%s\n", __func__);
/* Regular USB Cleanup */
usb_deregister(&smsusb_driver);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/7dabf139fca50009c4b002c36c33813f5c9c4ab4
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
