Remove unused mutexes

Due to changes introduced by the RT patch struct mutex no longer contains
fields that contain self-references. Without them several mutexes appear
as unused and can safely be remove to prevent compilation errors.

Change-Id: Iac3f0d26b5fb58908c69addd505b46b97b66b761
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/drivers/amlogic/media/camera/common/vm.h b/drivers/amlogic/media/camera/common/vm.h
index 9c297e2..b34f456 100644 (file)
--- a/drivers/amlogic/media/camera/common/vm.h
+++ b/drivers/amlogic/media/camera/common/vm.h
@@ -123,8 +123,6 @@ extern void vm_local_init(void);
 
 extern void vm_deinit_resource(struct vm_init_s *info);
 
-static DEFINE_MUTEX(vm_mutex);
-
 /* #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON6TV */
 #if 1
 #define CANVAS_WIDTH_ALIGN 32

diff --git a/drivers/amlogic/media/common/ge2d/ge2d_main.c b/drivers/amlogic/media/common/ge2d/ge2d_main.c
index 3af1715..baea6aa 100644 (file)
--- a/drivers/amlogic/media/common/ge2d/ge2d_main.c
+++ b/drivers/amlogic/media/common/ge2d/ge2d_main.c
@@ -67,7 +67,6 @@ struct ge2d_device_s {
 
 void __iomem *ge2d_reg_map;
 static struct ge2d_device_s ge2d_device;
-static DEFINE_MUTEX(ge2d_mutex);
 unsigned int ge2d_log_level;
 unsigned int ge2d_dump_reg_enable;
 unsigned int ge2d_dump_reg_cnt;

diff --git a/drivers/amlogic/media/osd/osd_logo.c b/drivers/amlogic/media/osd/osd_logo.c
index d00279e..b246e2c 100644 (file)
--- a/drivers/amlogic/media/osd/osd_logo.c
+++ b/drivers/amlogic/media/osd/osd_logo.c
@@ -36,8 +36,6 @@
 #undef pr_fmt
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-static DEFINE_MUTEX(logo_lock);
-
 struct para_pair_s {
        char *name;
        int value;

diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_log.h b/drivers/amlogic/media/vout/cvbs/cvbs_log.h
index 25f248a..aaab24c 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/cvbs_log.h
+++ b/drivers/amlogic/media/vout/cvbs/cvbs_log.h
@@ -39,29 +39,4 @@ inline ssize_t show_info(char *name, char *buf)
        return snprintf(buf, 40, "%s\n", name);
 }
 
-#define  STORE_INFO(name) \
-       {mutex_lock(&cvbs_mutex); \
-       snprintf(name, 40, "%s", buf); \
-       mutex_unlock(&cvbs_mutex); }
-
-#define SET_CVBS_CLASS_ATTR(name, op) \
-static char name[40]; \
-static ssize_t aml_CVBS_attr_##name##_show(struct class *cla, \
-               struct class_attribute *attr, char *buf) \
-{ \
-       return show_info(name, buf); \
-} \
-static ssize_t  aml_CVBS_attr_##name##_store(struct class *cla, \
-               struct class_attribute *attr, \
-                           const char *buf, size_t count) \
-{ \
-       STORE_INFO(name); \
-       op(name); \
-       return strnlen(buf, count); \
-} \
-struct  class_attribute  class_CVBS_attr_##name =  \
-__ATTR(name, 0644, \
-               aml_CVBS_attr_##name##_show, aml_CVBS_attr_##name##_store)
-
-
 #endif

diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_out.c b/drivers/amlogic/media/vout/cvbs/cvbs_out.c
index b6b506b..5d9923a 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/cvbs_out.c
+++ b/drivers/amlogic/media/vout/cvbs/cvbs_out.c
@@ -161,6 +161,31 @@ static unsigned int vdac_cfg_valid;
 static unsigned int vdac_cfg_value;
 static DEFINE_MUTEX(setmode_mutex);
 static DEFINE_MUTEX(CC_mutex);
+static DEFINE_MUTEX(cvbs_mutex);
+
+#define  STORE_INFO(name) \
+       {mutex_lock(&cvbs_mutex); \
+       snprintf(name, 40, "%s", buf); \
+       mutex_unlock(&cvbs_mutex); }
+
+#define SET_CVBS_CLASS_ATTR(name, op) \
+static char name[40]; \
+static ssize_t aml_CVBS_attr_##name##_show(struct class *cla, \
+               struct class_attribute *attr, char *buf) \
+{ \
+       return show_info(name, buf); \
+} \
+static ssize_t  aml_CVBS_attr_##name##_store(struct class *cla, \
+               struct class_attribute *attr, \
+                           const char *buf, size_t count) \
+{ \
+       STORE_INFO(name); \
+       op(name); \
+       return strnlen(buf, count); \
+} \
+struct  class_attribute  class_CVBS_attr_##name =  \
+__ATTR(name, 0644, \
+               aml_CVBS_attr_##name##_show, aml_CVBS_attr_##name##_store)
 
 static int cvbs_vdac_power_level;
 static void vdac_power_level_store(char *para);

diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_out.h b/drivers/amlogic/media/vout/cvbs/cvbs_out.h
index 3016b70..334bf66 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/cvbs_out.h
+++ b/drivers/amlogic/media/vout/cvbs/cvbs_out.h
@@ -87,8 +87,6 @@ struct disp_module_info_s {
        struct clk *vdac_clk_gate;
 };
 
-static  DEFINE_MUTEX(cvbs_mutex);
-
 struct vout_CCparm_s {
        unsigned int type;
        unsigned char data1;