V4L/DVB (5766): ET61x251 driver updates

- Make the driver depend on V4L2 only (KConfig)
- Better and safe locking mechanism of the device structure on open(),
  close() and disconnect()
- Use kref for handling device deallocation
- Generic cleanups

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index 262f98e12409..02c741d8f85a 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -36,6 +36,7 @@
 #include <linux/mutex.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <linux/kref.h>
 
 #include "et61x251_sensor.h"
 
@@ -134,7 +135,7 @@ struct et61x251_module_param {
 };
 
 static DEFINE_MUTEX(et61x251_sysfs_lock);
-static DECLARE_RWSEM(et61x251_disconnect);
+static DECLARE_RWSEM(et61x251_dev_lock);
 
 struct et61x251_device {
         struct video_device* v4ldev;
@@ -158,12 +159,14 @@ struct et61x251_device {
         struct et61x251_sysfs_attr sysfs;
         struct et61x251_module_param module_param;
 
+        struct kref kref;
         enum et61x251_dev_state state;
         u8 users;
 
-        struct mutex dev_mutex, fileop_mutex;
+        struct completion probe;
+        struct mutex open_mutex, fileop_mutex;
         spinlock_t queue_lock;
-        wait_queue_head_t open, wait_frame, wait_stream;
+        wait_queue_head_t wait_open, wait_frame, wait_stream;
 };
 
 /*****************************************************************************/
@@ -177,7 +180,7 @@ et61x251_match_id(struct et61x251_device* cam, const struct usb_device_id *id)
 
 void
 et61x251_attach_sensor(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor)
+                       const struct et61x251_sensor* sensor)
 {
         memcpy(&cam->sensor, sensor, sizeof(struct et61x251_sensor));
 }
@@ -195,8 +198,8 @@ do {                                                                          \
                 else if ((level) == 2)                                        \
                         dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
-                        dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                        dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n",   \
+                                 __FILE__, __FUNCTION__, __LINE__ , ## args); \
         }                                                                     \
 } while (0)
 #       define KDBG(level, fmt, args...)                                      \
@@ -205,8 +208,8 @@ do {                                                                          \
                 if ((level) == 1 || (level) == 2)                             \
                         pr_info("et61x251: " fmt "\n", ## args);              \
                 else if ((level) == 3)                                        \
-                        pr_debug("et61x251: [%s:%d] " fmt "\n", __FUNCTION__, \
-                                 __LINE__ , ## args);                         \
+                        pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__,   \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 } while (0)
 #       define V4LDBG(level, name, cmd)                                       \
@@ -222,8 +225,8 @@ do {                                                                          \
 
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
-dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",                              \
-         __FUNCTION__, __LINE__ , ## args)
+dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __FUNCTION__,   \
+         __LINE__ , ## args)
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0) /* placeholder */