aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/siano/smscoreapi.c26
-rw-r--r--drivers/media/dvb/siano/smsdvb.c24
-rw-r--r--drivers/media/dvb/siano/smsusb.c4
3 files changed, 32 insertions, 22 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 084ddc39c98..3c0e64286d4 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -568,7 +568,7 @@ int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer,
msleep(500);
}
- printk("%s rc=%d, postload=%p \n", __func__, rc,
+ printk(KERN_DEBUG "%s rc=%d, postload=%p \n", __func__, rc,
coredev->postload_handler);
kfree(msg);
@@ -710,8 +710,8 @@ 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",
- __func__);
+ printk(KERN_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))) {
@@ -719,7 +719,8 @@ int smscore_detect_mode(smscore_device_t *coredev)
coredev, msg, msg->msgLength,
&coredev->version_ex_done);
if (rc < 0)
- printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed "
+ printk(KERN_ERR "%s: "
+ "MSG_SMS_GET_VERSION_EX_REQ failed "
"second try, rc %d\n", __func__, rc);
} else
rc = -ETIME;
@@ -921,7 +922,7 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
last_sample_time = time_now;
if (time_now - last_sample_time > 10000) {
- printk("\n%s data rate %d bytes/secs\n", __func__,
+ printk(KERN_DEBUG "\n%s data rate %d bytes/secs\n", __func__,
(int)((data_total * 1000) /
(time_now - last_sample_time)));
@@ -940,8 +941,8 @@ 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", __func__,
+ 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);
@@ -953,21 +954,24 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
break;
}
case MSG_SMS_INIT_DEVICE_RES:
- printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __func__);
+ printk(KERN_DEBUG "%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", __func__);
+ printk(KERN_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("%s: MSG_SW_RELOAD_EXEC_RES\n", __func__);
+ printk(KERN_DEBUG "%s: MSG_SW_RELOAD_EXEC_RES\n",
+ __func__);
break;
case MSG_SMS_SWDOWNLOAD_TRIGGER_RES:
- printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n",
+ printk(KERN_DEBUG "%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n",
__func__);
complete(&coredev->trigger_done);
break;
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index f46e7facdb6..65b1db61ac1 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -111,7 +111,8 @@ static int smsdvb_start_feed(struct dvb_demux_feed *feed)
container_of(feed->demux, smsdvb_client_t, demux);
SmsMsgData_ST PidMsg;
- printk("%s add pid %d(%x)\n", __func__, feed->pid, feed->pid);
+ printk(KERN_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;
@@ -130,7 +131,8 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed)
container_of(feed->demux, smsdvb_client_t, demux);
SmsMsgData_ST PidMsg;
- printk("%s remove pid %d(%x)\n", __func__, feed->pid, feed->pid);
+ printk(KERN_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;
@@ -212,7 +214,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", __func__);
+ printk(KERN_DEBUG "%s\n", __func__);
tune->min_delay_ms = 400;
tune->step_size = 250000;
@@ -239,7 +241,7 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,
Msg.Data[0] = fep->frequency;
Msg.Data[2] = 12000000;
- printk("%s freq %d band %d\n", __func__,
+ printk(KERN_DEBUG "%s freq %d band %d\n", __func__,
fep->frequency, fep->u.ofdm.bandwidth);
switch (fep->u.ofdm.bandwidth) {
@@ -259,7 +261,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,
{
smsdvb_client_t *client = container_of(fe, smsdvb_client_t, frontend);
- printk("%s\n", __func__);
+ printk(KERN_DEBUG "%s\n", __func__);
/* todo: */
memcpy(fep, &client->fe_params,
@@ -328,7 +330,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
rc = dvb_register_adapter(&client->adapter, "Siano Digital Receiver",
THIS_MODULE, device, adapter_nr);
if (rc < 0) {
- printk("%s dvb_register_adapter() failed %d\n", __func__, rc);
+ printk(KERN_ERR "%s dvb_register_adapter() failed %d\n",
+ __func__, rc);
goto adapter_error;
}
@@ -341,7 +344,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
rc = dvb_dmx_init(&client->demux);
if (rc < 0) {
- printk("%s dvb_dmx_init failed %d\n\n", __func__, rc);
+ printk(KERN_ERR "%s dvb_dmx_init failed %d\n\n",
+ __func__, rc);
goto dvbdmx_error;
}
@@ -352,7 +356,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter);
if (rc < 0) {
- printk("%s dvb_dmxdev_init failed %d\n", __func__, rc);
+ printk(KERN_ERR "%s dvb_dmxdev_init failed %d\n",
+ __func__, rc);
goto dmxdev_error;
}
@@ -362,7 +367,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
rc = dvb_register_frontend(&client->adapter, &client->frontend);
if (rc < 0) {
- printk("%s frontend registration failed %d\n", __func__, rc);
+ printk(KERN_ERR "%s frontend registration failed %d\n",
+ __func__, rc);
goto frontend_error;
}
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 102c5857a23..82f2e3e4bec 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -241,7 +241,7 @@ void smsusb1_detectmode(void *context, int *mode)
if (!product_string) {
product_string = "none";
- printk("%s product string not found\n", __func__);
+ printk(KERN_ERR "%s product string not found\n", __func__);
} else if (strstr(product_string, "DVBH"))
*mode = 1;
else if (strstr(product_string, "BDA"))
@@ -251,7 +251,7 @@ void smsusb1_detectmode(void *context, int *mode)
else if (strstr(product_string, "TDMB"))
*mode = 2;
- printk("%s: %d \"%s\"\n", __func__, *mode, product_string);
+ printk(KERN_INFO "%s: %d \"%s\"\n", __func__, *mode, product_string);
}
int smsusb1_setmode(void *context, int mode)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:22:40 +0000