kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] v4l2-mc: add a routine to create USB media_device

Browse source 
Instead of copying exactly the same code on all USB devices,
add an ancillary routine that will create and fill the
struct media_device with the values imported from the USB
device.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-02-11 15:21:46 -02:00
parent db152276ce
commit eee7d353a1
2 changed files with 74 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/media/v4l2-core/v4l2-mc.c
View file

@ -16,12 +16,13 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/usb.h>
#include <media/media-entity.h>
#include <media/v4l2-mc.h>
struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
char *name)
const char *name)
{
#ifdef CONFIG_PCI
struct media_device *mdev;
@ -53,6 +54,44 @@ struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
}
EXPORT_SYMBOL_GPL(v4l2_mc_pci_media_device_init);
struct media_device *__v4l2_mc_usb_media_device_init(struct usb_device *udev,
const char *board_name,
const char *driver_name)
{
#ifdef CONFIG_USB
struct media_device *mdev;
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev)
return NULL;
mdev->dev = &udev->dev;
if (driver_name)
strlcpy(mdev->driver_name, driver_name,
sizeof(mdev->driver_name));
if (board_name)
strlcpy(mdev->model, board_name, sizeof(mdev->model));
else if (udev->product)
strlcpy(mdev->model, udev->product, sizeof(mdev->model));
else
strlcpy(mdev->model, "unknown model", sizeof(mdev->model));
if (udev->serial)
strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
usb_make_path(udev, mdev->bus_info, sizeof(mdev->bus_info));
mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
mdev->driver_version = LINUX_VERSION_CODE;
media_device_init(mdev);
return mdev;
#else
return NULL;
#endif
}
EXPORT_SYMBOL_GPL(__v4l2_mc_usb_media_device_init);
int v4l2_mc_create_media_graph(struct media_device *mdev)
{

39
include/media/v4l2-mc.h
View file

@ -95,8 +95,9 @@ enum demod_pad_index {
DEMOD_NUM_PADS
};
struct pci_dev; /* We don't need to include pci.h here */
/* We don't need to include pci.h or usb.h here */
struct pci_dev;
struct usb_device;
#ifdef CONFIG_MEDIA_CONTROLLER
/**
@ -124,8 +125,24 @@ int v4l2_mc_create_media_graph(struct media_device *mdev);
* name for the pci device, given by pci_name() macro.
*/
struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
char *name);
const char *name);
/**
* __v4l2_mc_usb_media_device_init() - create and initialize a
* struct &media_device from a PCI device.
*
* @udev: pointer to struct usb_device
* @board_name: media device name. If %NULL, the routine will use the usb
* product name, if available.
* @driver_name: name of the driver. if %NULL, the routine will use the name
* given by udev->dev->driver->name, with is usually the wrong
* thing to do.
*
* NOTE: It is better to call v4l2_mc_usb_media_device_init() instead, as
* such macro fills driver_name with %KBUILD_MODNAME.
*/
struct media_device *__v4l2_mc_usb_media_device_init(struct usb_device *udev,
const char *board_name,
const char *driver_name);
#else
static inline int v4l2_mc_create_media_graph(struct media_device *mdev)
@ -133,11 +150,23 @@ static inline int v4l2_mc_create_media_graph(struct media_device *mdev)
return 0;
}
static inline
struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
char *name) {
char *name)
{
return NULL;
}
static inline
struct media_device *__v4l2_mc_usb_media_device_init(struct usb_device *udev,
char *board_name,
char *driver_name)
{
return NULL;
}
#endif
#define v4l2_mc_usb_media_device_init(udev, name) \
__v4l2_mc_usb_media_device_init(udev, name, KBUILD_MODNAME)
#endif