aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/siano/smscoreapi.c4
-rw-r--r--drivers/media/dvb/siano/smscoreapi.h5
-rw-r--r--drivers/media/dvb/siano/smsdvb.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 1dd19660003..9e7730a40e0 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -112,10 +112,10 @@ struct smscore_registry_entry_t {
112 112
113struct list_head g_smscore_notifyees; 113struct list_head g_smscore_notifyees;
114struct list_head g_smscore_devices; 114struct list_head g_smscore_devices;
115kmutex_t g_smscore_deviceslock; 115struct mutex g_smscore_deviceslock;
116 116
117struct list_head g_smscore_registry; 117struct list_head g_smscore_registry;
118kmutex_t g_smscore_registrylock; 118struct mutex g_smscore_registrylock;
119 119
120static int default_mode = 4; 120static int default_mode = 4;
121 121
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index eeb5c0a7f62..fb6acaefcbc 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -36,8 +36,6 @@
36 36
37#include <linux/mutex.h> 37#include <linux/mutex.h>
38 38
39typedef struct mutex kmutex_t;
40
41#define kmutex_init(_p_) mutex_init(_p_) 39#define kmutex_init(_p_) mutex_init(_p_)
42#define kmutex_lock(_p_) mutex_lock(_p_) 40#define kmutex_lock(_p_) mutex_lock(_p_)
43#define kmutex_trylock(_p_) mutex_trylock(_p_) 41#define kmutex_trylock(_p_) mutex_trylock(_p_)
@@ -392,7 +390,8 @@ extern void smscore_onresponse(struct smscore_device_t *coredev,
392 struct smscore_buffer_t *cb); 390 struct smscore_buffer_t *cb);
393 391
394 392
395extern struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev); 393extern
394struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
396extern void smscore_putbuffer(struct smscore_device_t *coredev, 395extern void smscore_putbuffer(struct smscore_device_t *coredev,
397 struct smscore_buffer_t *cb); 396 struct smscore_buffer_t *cb);
398 397
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 72d1de7a6de..6f9c1856386 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -28,7 +28,7 @@
28DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 28DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
29 29
30struct list_head g_smsdvb_clients; 30struct list_head g_smsdvb_clients;
31kmutex_t g_smsdvb_clientslock; 31struct mutex g_smsdvb_clientslock;
32 32
33static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) 33static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
34{ 34{