Now that the media device can be allocated dynamically, drivers have no
longer a way to conveniently obtain the driver private data structure.
Provide one again in the form of a private pointer passed to the
media_device_alloc() function.
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
---
drivers/media/media-device.c | 3 ++-
include/media/media-device.h | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 6c8b689..27d5214 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -699,7 +699,7 @@ void media_device_init(struct media_device *mdev)
}
EXPORT_SYMBOL_GPL(media_device_init);
-struct media_device *media_device_alloc(struct device *dev)
+struct media_device *media_device_alloc(struct device *dev, void *priv)
{
struct media_device *mdev;
@@ -716,6 +716,7 @@ struct media_device *media_device_alloc(struct device *dev)
media_devnode_init(&mdev->devnode);
mdev->dev = dev;
media_device_init(mdev);
+ mdev->priv = priv;
return mdev;
}
diff --git a/include/media/media-device.h b/include/media/media-device.h
index 8ccc8e8..cfcec1b 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -52,6 +52,7 @@ struct media_entity_notify {
* struct media_device - Media device
* @dev: Parent device
* @devnode: Media device node
+ * @priv: A pointer to driver private data
* @driver_name: Optional device driver name. If not set, calls to
* %MEDIA_IOC_DEVICE_INFO will return dev->driver->name.
* This is needed for USB drivers for example, as otherwise
@@ -117,6 +118,7 @@ struct media_device {
/* dev->driver_data points to this struct. */
struct device *dev;
struct media_devnode devnode;
+ void *priv;
char model[32];
char driver_name[32];
@@ -200,6 +202,7 @@ void media_device_init(struct media_device *mdev);
* media_device_alloc() - Allocate and initialise a media device
*
* @dev: The associated struct device pointer
+ * @priv: pointer to a driver private data structure
*
* Allocate and initialise a media device. Returns a media device.
* The media device is refcounted, and this function returns a media
@@ -208,7 +211,7 @@ void media_device_init(struct media_device *mdev);
* References are taken and given using media_device_get() and
* media_device_put().
*/
-struct media_device *media_device_alloc(struct device *dev);
+struct media_device *media_device_alloc(struct device *dev, void *priv);
/**
* media_device_get() - Get a reference to a media device
@@ -235,6 +238,16 @@ struct media_device *media_device_alloc(struct device *dev);
} while (0)
/**
+ * media_device_priv() - Obtain the driver private pointer
+ *
+ * Returns a pointer passed to the media_device_alloc() function.
+ */
+static inline void *media_device_priv(struct media_device *mdev)
+{
+ return mdev->priv;
+}
+
+/**
* media_device_cleanup() - Cleanups a media device element
*
* @mdev: pointer to struct &media_device
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
