[WATCHDOG] Merge code clean-up's from Alan Cox.

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / siano / smsdvb.c

diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index b17696fcbbc66929193005c580311d7f4f08a327..229274a14110515a8c00f020162c0310d1ab4d53 100644 (file)
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -1,5 +1,5 @@
 /*
- *  Driver for the Siano SMS10xx USB dongle
+ *  Driver for the Siano SMS1xxx USB dongle
  *
  *  author: Anatoly Greenblat
  *
@@ -23,13 +23,14 @@
 #include <linux/init.h>
 
 #include "smscoreapi.h"
+#include "sms-cards.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-struct list_head g_smsdvb_clients;
-kmutex_t g_smsdvb_clientslock;
+static struct list_head g_smsdvb_clients;
+static struct mutex g_smsdvb_clientslock;
 
-int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
+static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
 {
        struct smsdvb_client_t *client = (struct smsdvb_client_t *) context;
        struct SmsMsgHdr_ST *phdr =
@@ -83,7 +84,7 @@ int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
        return 0;
 }
 
-void smsdvb_unregister_client(struct smsdvb_client_t *client)
+static void smsdvb_unregister_client(struct smsdvb_client_t *client)
 {
        /* must be called under clientslock */
 
@@ -97,7 +98,7 @@ void smsdvb_unregister_client(struct smsdvb_client_t *client)
        kfree(client);
 }
 
-void smsdvb_onremove(void *context)
+static void smsdvb_onremove(void *context)
 {
        kmutex_lock(&g_smsdvb_clientslock);
 
@@ -112,8 +113,8 @@ static int smsdvb_start_feed(struct dvb_demux_feed *feed)
                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("add pid %d(%x)",
+                 feed->pid, feed->pid);
 
        PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
        PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -132,8 +133,8 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed)
                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("remove pid %d(%x)",
+                 feed->pid, feed->pid);
 
        PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
        PidMsg.xMsgHeader.msgDstId = HIF_TASK;
@@ -219,7 +220,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(KERN_DEBUG "%s\n", __func__);
+       sms_debug("");
 
        tune->min_delay_ms = 400;
        tune->step_size = 250000;
@@ -246,8 +247,8 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,
        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("freq %d band %d",
+                 fep->frequency, fep->u.ofdm.bandwidth);
 
        switch (fep->u.ofdm.bandwidth) {
        case BANDWIDTH_8_MHZ: Msg.Data[1] = BW_8_MHZ; break;
@@ -267,7 +268,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,
        struct smsdvb_client_t *client =
                container_of(fe, struct smsdvb_client_t, frontend);
 
-       printk(KERN_DEBUG "%s\n", __func__);
+       sms_debug("");
 
        /* todo: */
        memcpy(fep, &client->fe_params,
@@ -282,7 +283,7 @@ static void smsdvb_release(struct dvb_frontend *fe)
 
 static struct dvb_frontend_ops smsdvb_fe_ops = {
        .info = {
-               .name                   = "Siano Mobile Digital SMS10xx",
+               .name                   = "Siano Mobile Digital SMS1xxx",
                .type                   = FE_OFDM,
                .frequency_min          = 44250000,
                .frequency_max          = 867250000,
@@ -309,8 +310,8 @@ static struct dvb_frontend_ops smsdvb_fe_ops = {
        .read_snr = smsdvb_read_snr,
 };
 
-int smsdvb_hotplug(struct smscore_device_t *coredev,
-                  struct device *device, int arrival)
+static int smsdvb_hotplug(struct smscore_device_t *coredev,
+                         struct device *device, int arrival)
 {
        struct smsclient_params_t params;
        struct smsdvb_client_t *client;
@@ -321,23 +322,24 @@ int smsdvb_hotplug(struct smscore_device_t *coredev,
                return 0;
 
        if (smscore_get_device_mode(coredev) != 4) {
-               printk(KERN_ERR "%sSMS Device mode is not set for "
-                      "DVB operation.\n", __func__);
+               sms_err("SMS Device mode is not set for "
+                       "DVB operation.");
                return 0;
        }
 
        client = kzalloc(sizeof(struct smsdvb_client_t), GFP_KERNEL);
        if (!client) {
-               printk(KERN_INFO "%s kmalloc() failed\n", __func__);
+               sms_err("kmalloc() failed");
                return -ENOMEM;
        }
 
        /* register dvb adapter */
-       rc = dvb_register_adapter(&client->adapter, "Siano Digital Receiver",
+       rc = dvb_register_adapter(&client->adapter,
+                                 sms_get_board(
+                                       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("dvb_register_adapter() failed %d", rc);
                goto adapter_error;
        }
 
@@ -350,8 +352,7 @@ int smsdvb_hotplug(struct smscore_device_t *coredev,
 
        rc = dvb_dmx_init(&client->demux);
        if (rc < 0) {
-               printk(KERN_ERR "%s dvb_dmx_init failed %d\n\n",
-                      __func__, rc);
+               sms_err("dvb_dmx_init failed %d", rc);
                goto dvbdmx_error;
        }
 
@@ -362,8 +363,7 @@ int smsdvb_hotplug(struct smscore_device_t *coredev,
 
        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("dvb_dmxdev_init failed %d", rc);
                goto dmxdev_error;
        }
 
@@ -373,8 +373,7 @@ int smsdvb_hotplug(struct smscore_device_t *coredev,
 
        rc = dvb_register_frontend(&client->adapter, &client->frontend);
        if (rc < 0) {
-               printk(KERN_ERR "%s frontend registration failed %d\n",
-                      __func__, rc);
+               sms_err("frontend registration failed %d", rc);
                goto frontend_error;
        }
 
@@ -386,8 +385,7 @@ int smsdvb_hotplug(struct smscore_device_t *coredev,
 
        rc = smscore_register_client(coredev, &params, &client->smsclient);
        if (rc < 0) {
-               printk(KERN_INFO "%s smscore_register_client() failed %d\n",
-                      __func__, rc);
+               sms_err("smscore_register_client() failed %d", rc);
                goto client_error;
        }
 
@@ -402,7 +400,7 @@ int smsdvb_hotplug(struct smscore_device_t *coredev,
 
        kmutex_unlock(&g_smsdvb_clientslock);
 
-       printk(KERN_INFO "%s success\n", __func__);
+       sms_info("success");
 
        return 0;
 
@@ -432,7 +430,7 @@ int smsdvb_register(void)
 
        rc = smscore_register_hotplug(smsdvb_hotplug);
 
-       printk(KERN_INFO "%s\n", __func__);
+       sms_debug("");
 
        return rc;
 }