aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-06-15 16:26:42 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:21:44 -0400
commit9f2113975a7898c913c668bb709e95c27e51617b (patch)
treef35a5113a588de8a69794db0eea042a6537d8089
parent59bf6b8e85209f4b875e319b42e8f13af7797826 (diff)
V4L/DVB (8284): sms1xxx: fix WARNING: printk() should include KERN_ facility level
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-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 084ddc39c989..3c0e64286d4e 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,
568 msleep(500); 568 msleep(500);
569 } 569 }
570 570
571 printk("%s rc=%d, postload=%p \n", __func__, rc, 571 printk(KERN_DEBUG "%s rc=%d, postload=%p \n", __func__, rc,
572 coredev->postload_handler); 572 coredev->postload_handler);
573 573
574 kfree(msg); 574 kfree(msg);
@@ -710,8 +710,8 @@ int smscore_detect_mode(smscore_device_t *coredev)
710 rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, 710 rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength,
711 &coredev->version_ex_done); 711 &coredev->version_ex_done);
712 if (rc == -ETIME) { 712 if (rc == -ETIME) {
713 printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed first try\n", 713 printk(KERN_ERR "%s: MSG_SMS_GET_VERSION_EX_REQ "
714 __func__); 714 "failed first try\n", __func__);
715 715
716 if (wait_for_completion_timeout(&coredev->resume_done, 716 if (wait_for_completion_timeout(&coredev->resume_done,
717 msecs_to_jiffies(5000))) { 717 msecs_to_jiffies(5000))) {
@@ -719,7 +719,8 @@ int smscore_detect_mode(smscore_device_t *coredev)
719 coredev, msg, msg->msgLength, 719 coredev, msg, msg->msgLength,
720 &coredev->version_ex_done); 720 &coredev->version_ex_done);
721 if (rc < 0) 721 if (rc < 0)
722 printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed " 722 printk(KERN_ERR "%s: "
723 "MSG_SMS_GET_VERSION_EX_REQ failed "
723 "second try, rc %d\n", __func__, rc); 724 "second try, rc %d\n", __func__, rc);
724 } else 725 } else
725 rc = -ETIME; 726 rc = -ETIME;
@@ -921,7 +922,7 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
921 last_sample_time = time_now; 922 last_sample_time = time_now;
922 923
923 if (time_now - last_sample_time > 10000) { 924 if (time_now - last_sample_time > 10000) {
924 printk("\n%s data rate %d bytes/secs\n", __func__, 925 printk(KERN_DEBUG "\n%s data rate %d bytes/secs\n", __func__,
925 (int)((data_total * 1000) / 926 (int)((data_total * 1000) /
926 (time_now - last_sample_time))); 927 (time_now - last_sample_time)));
927 928
@@ -940,8 +941,8 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
940 case MSG_SMS_GET_VERSION_EX_RES: 941 case MSG_SMS_GET_VERSION_EX_RES:
941 { 942 {
942 SmsVersionRes_ST *ver = (SmsVersionRes_ST *) phdr; 943 SmsVersionRes_ST *ver = (SmsVersionRes_ST *) phdr;
943 printk("%s: MSG_SMS_GET_VERSION_EX_RES id %d " 944 printk(KERN_DEBUG "%s: MSG_SMS_GET_VERSION_EX_RES "
944 "prots 0x%x ver %d.%d\n", __func__, 945 "id %d prots 0x%x ver %d.%d\n", __func__,
945 ver->FirmwareId, ver->SupportedProtocols, 946 ver->FirmwareId, ver->SupportedProtocols,
946 ver->RomVersionMajor, ver->RomVersionMinor); 947 ver->RomVersionMajor, ver->RomVersionMinor);
947 948
@@ -953,21 +954,24 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
953 break; 954 break;
954 } 955 }
955 case MSG_SMS_INIT_DEVICE_RES: 956 case MSG_SMS_INIT_DEVICE_RES:
956 printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __func__); 957 printk(KERN_DEBUG "%s: MSG_SMS_INIT_DEVICE_RES\n",
958 __func__);
957 complete(&coredev->init_device_done); 959 complete(&coredev->init_device_done);
958 break; 960 break;
959 case MSG_SW_RELOAD_START_RES: 961 case MSG_SW_RELOAD_START_RES:
960 printk("%s: MSG_SW_RELOAD_START_RES\n", __func__); 962 printk(KERN_DEBUG "%s: MSG_SW_RELOAD_START_RES\n",
963 __func__);
961 complete(&coredev->reload_start_done); 964 complete(&coredev->reload_start_done);
962 break; 965 break;
963 case MSG_SMS_DATA_DOWNLOAD_RES: 966 case MSG_SMS_DATA_DOWNLOAD_RES:
964 complete(&coredev->data_download_done); 967 complete(&coredev->data_download_done);
965 break; 968 break;
966 case MSG_SW_RELOAD_EXEC_RES: 969 case MSG_SW_RELOAD_EXEC_RES:
967 printk("%s: MSG_SW_RELOAD_EXEC_RES\n", __func__); 970 printk(KERN_DEBUG "%s: MSG_SW_RELOAD_EXEC_RES\n",
971 __func__);
968 break; 972 break;
969 case MSG_SMS_SWDOWNLOAD_TRIGGER_RES: 973 case MSG_SMS_SWDOWNLOAD_TRIGGER_RES:
970 printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n", 974 printk(KERN_DEBUG "%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n",
971 __func__); 975 __func__);
972 complete(&coredev->trigger_done); 976 complete(&coredev->trigger_done);
973 break; 977 break;
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index f46e7facdb6b..65b1db61ac15 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)
111 container_of(feed->demux, smsdvb_client_t, demux); 111 container_of(feed->demux, smsdvb_client_t, demux);
112 SmsMsgData_ST PidMsg; 112 SmsMsgData_ST PidMsg;
113 113
114 printk("%s add pid %d(%x)\n", __func__, feed->pid, feed->pid); 114 printk(KERN_DEBUG "%s add pid %d(%x)\n", __func__,
115 feed->pid, feed->pid);
115 116
116 PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; 117 PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
117 PidMsg.xMsgHeader.msgDstId = HIF_TASK; 118 PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -130,7 +131,8 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed)
130 container_of(feed->demux, smsdvb_client_t, demux); 131 container_of(feed->demux, smsdvb_client_t, demux);
131 SmsMsgData_ST PidMsg; 132 SmsMsgData_ST PidMsg;
132 133
133 printk("%s remove pid %d(%x)\n", __func__, feed->pid, feed->pid); 134 printk(KERN_DEBUG "%s remove pid %d(%x)\n", __func__,
135 feed->pid, feed->pid);
134 136
135 PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; 137 PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
136 PidMsg.xMsgHeader.msgDstId = HIF_TASK; 138 PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -212,7 +214,7 @@ static int smsdvb_read_snr(struct dvb_frontend *fe, u16 *snr)
212static int smsdvb_get_tune_settings(struct dvb_frontend *fe, 214static int smsdvb_get_tune_settings(struct dvb_frontend *fe,
213 struct dvb_frontend_tune_settings *tune) 215 struct dvb_frontend_tune_settings *tune)
214{ 216{
215 printk("%s\n", __func__); 217 printk(KERN_DEBUG "%s\n", __func__);
216 218
217 tune->min_delay_ms = 400; 219 tune->min_delay_ms = 400;
218 tune->step_size = 250000; 220 tune->step_size = 250000;
@@ -239,7 +241,7 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,
239 Msg.Data[0] = fep->frequency; 241 Msg.Data[0] = fep->frequency;
240 Msg.Data[2] = 12000000; 242 Msg.Data[2] = 12000000;
241 243
242 printk("%s freq %d band %d\n", __func__, 244 printk(KERN_DEBUG "%s freq %d band %d\n", __func__,
243 fep->frequency, fep->u.ofdm.bandwidth); 245 fep->frequency, fep->u.ofdm.bandwidth);
244 246
245 switch (fep->u.ofdm.bandwidth) { 247 switch (fep->u.ofdm.bandwidth) {
@@ -259,7 +261,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,
259{ 261{
260 smsdvb_client_t *client = container_of(fe, smsdvb_client_t, frontend); 262 smsdvb_client_t *client = container_of(fe, smsdvb_client_t, frontend);
261 263
262 printk("%s\n", __func__); 264 printk(KERN_DEBUG "%s\n", __func__);
263 265
264 /* todo: */ 266 /* todo: */
265 memcpy(fep, &client->fe_params, 267 memcpy(fep, &client->fe_params,
@@ -328,7 +330,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
328 rc = dvb_register_adapter(&client->adapter, "Siano Digital Receiver", 330 rc = dvb_register_adapter(&client->adapter, "Siano Digital Receiver",
329 THIS_MODULE, device, adapter_nr); 331 THIS_MODULE, device, adapter_nr);
330 if (rc < 0) { 332 if (rc < 0) {
331 printk("%s dvb_register_adapter() failed %d\n", __func__, rc); 333 printk(KERN_ERR "%s dvb_register_adapter() failed %d\n",
334 __func__, rc);
332 goto adapter_error; 335 goto adapter_error;
333 } 336 }
334 337
@@ -341,7 +344,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
341 344
342 rc = dvb_dmx_init(&client->demux); 345 rc = dvb_dmx_init(&client->demux);
343 if (rc < 0) { 346 if (rc < 0) {
344 printk("%s dvb_dmx_init failed %d\n\n", __func__, rc); 347 printk(KERN_ERR "%s dvb_dmx_init failed %d\n\n",
348 __func__, rc);
345 goto dvbdmx_error; 349 goto dvbdmx_error;
346 } 350 }
347 351
@@ -352,7 +356,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
352 356
353 rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter); 357 rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter);
354 if (rc < 0) { 358 if (rc < 0) {
355 printk("%s dvb_dmxdev_init failed %d\n", __func__, rc); 359 printk(KERN_ERR "%s dvb_dmxdev_init failed %d\n",
360 __func__, rc);
356 goto dmxdev_error; 361 goto dmxdev_error;
357 } 362 }
358 363
@@ -362,7 +367,8 @@ int smsdvb_hotplug(smscore_device_t *coredev,
362 367
363 rc = dvb_register_frontend(&client->adapter, &client->frontend); 368 rc = dvb_register_frontend(&client->adapter, &client->frontend);
364 if (rc < 0) { 369 if (rc < 0) {
365 printk("%s frontend registration failed %d\n", __func__, rc); 370 printk(KERN_ERR "%s frontend registration failed %d\n",
371 __func__, rc);
366 goto frontend_error; 372 goto frontend_error;
367 } 373 }
368 374
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 102c5857a23d..82f2e3e4bec6 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)
241 241
242 if (!product_string) { 242 if (!product_string) {
243 product_string = "none"; 243 product_string = "none";
244 printk("%s product string not found\n", __func__); 244 printk(KERN_ERR "%s product string not found\n", __func__);
245 } else if (strstr(product_string, "DVBH")) 245 } else if (strstr(product_string, "DVBH"))
246 *mode = 1; 246 *mode = 1;
247 else if (strstr(product_string, "BDA")) 247 else if (strstr(product_string, "BDA"))
@@ -251,7 +251,7 @@ void smsusb1_detectmode(void *context, int *mode)
251 else if (strstr(product_string, "TDMB")) 251 else if (strstr(product_string, "TDMB"))
252 *mode = 2; 252 *mode = 2;
253 253
254 printk("%s: %d \"%s\"\n", __func__, *mode, product_string); 254 printk(KERN_INFO "%s: %d \"%s\"\n", __func__, *mode, product_string);
255} 255}
256 256
257int smsusb1_setmode(void *context, int mode) 257int smsusb1_setmode(void *context, int mode)