[media] media-device: move PCI/USB helper functions from v4l2-mc
Those ancillary functions could be called even when compiled without V4L2 support, as warned by ktest build robot: All errors (new ones prefixed by >>): >> ERROR: "__v4l2_mc_usb_media_device_init" [drivers/media/usb/dvb-usb/dvb-usb.ko] undefined! >> ERROR: "__v4l2_mc_usb_media_device_init" [drivers/media/usb/dvb-usb-v2/dvb_usb_v2.ko] undefined! >> ERROR: "__v4l2_mc_usb_media_device_init" [drivers/media/usb/au0828/au0828.ko] undefined! Also, there's nothing there that are specific to V4L2. So, move those ancillary functions to MC core. No functional changes. Just function rename. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab
Родитель
2ddf22eec4
Коммит
41b44e35ba
|
|
@ -27,6 +27,8 @@
|
|||
#include <linux/media.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/usb.h>
|
||||
|
||||
#include <media/media-device.h>
|
||||
#include <media/media-devnode.h>
|
||||
|
|
@ -753,4 +755,76 @@ struct media_device *media_device_find_devres(struct device *dev)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(media_device_find_devres);
|
||||
|
||||
struct media_device *media_device_pci_init(struct pci_dev *pci_dev,
|
||||
const char *name)
|
||||
{
|
||||
#ifdef CONFIG_PCI
|
||||
struct media_device *mdev;
|
||||
|
||||
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
|
||||
if (!mdev)
|
||||
return NULL;
|
||||
|
||||
mdev->dev = &pci_dev->dev;
|
||||
|
||||
if (name)
|
||||
strlcpy(mdev->model, name, sizeof(mdev->model));
|
||||
else
|
||||
strlcpy(mdev->model, pci_name(pci_dev), sizeof(mdev->model));
|
||||
|
||||
sprintf(mdev->bus_info, "PCI:%s", pci_name(pci_dev));
|
||||
|
||||
mdev->hw_revision = (pci_dev->subsystem_vendor << 16)
|
||||
| pci_dev->subsystem_device;
|
||||
|
||||
mdev->driver_version = LINUX_VERSION_CODE;
|
||||
|
||||
media_device_init(mdev);
|
||||
|
||||
return mdev;
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(media_device_pci_init);
|
||||
|
||||
struct media_device *__media_device_usb_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(__media_device_usb_init);
|
||||
|
||||
|
||||
#endif /* CONFIG_MEDIA_CONTROLLER */
|
||||
|
|
|
|||
|
|
@ -1043,7 +1043,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
|||
sprintf(dev->name, "saa%x[%d]", pci_dev->device, dev->nr);
|
||||
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER
|
||||
dev->media_dev = v4l2_mc_pci_media_device_init(pci_dev, dev->name);
|
||||
dev->media_dev = media_device_pci_init(pci_dev, dev->name);
|
||||
if (!dev->media_dev) {
|
||||
err = -ENOMEM;
|
||||
goto fail0;
|
||||
|
|
|
|||
|
|
@ -192,9 +192,9 @@ static int au0828_media_device_init(struct au0828_dev *dev,
|
|||
struct media_device *mdev;
|
||||
|
||||
if (!dev->board.name)
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, "unknown au0828");
|
||||
mdev = media_device_usb_init(udev, "unknown au0828");
|
||||
else
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, dev->board.name);
|
||||
mdev = media_device_usb_init(udev, dev->board.name);
|
||||
if (!mdev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -1212,7 +1212,7 @@ static int cx231xx_media_device_init(struct cx231xx *dev,
|
|||
#ifdef CONFIG_MEDIA_CONTROLLER
|
||||
struct media_device *mdev;
|
||||
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, dev->board.name);
|
||||
mdev = media_device_usb_init(udev, dev->board.name);
|
||||
if (!mdev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
|
||||
#include "dvb_usb_common.h"
|
||||
#include <media/v4l2-mc.h>
|
||||
#include <media/media-device.h>
|
||||
|
||||
static int dvb_usbv2_disable_rc_polling;
|
||||
module_param_named(disable_rc_polling, dvb_usbv2_disable_rc_polling, int, 0644);
|
||||
|
|
@ -408,7 +408,7 @@ static int dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap)
|
|||
struct dvb_usb_device *d = adap_to_d(adap);
|
||||
struct usb_device *udev = d->udev;
|
||||
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, d->name);
|
||||
mdev = media_device_usb_init(udev, d->name);
|
||||
if (!mdev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* linux-dvb API.
|
||||
*/
|
||||
#include "dvb-usb-common.h"
|
||||
#include <media/v4l2-mc.h>
|
||||
#include <media/media-device.h>
|
||||
|
||||
/* does the complete input transfer handling */
|
||||
static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
|
||||
|
|
@ -103,7 +103,7 @@ static int dvb_usb_media_device_init(struct dvb_usb_adapter *adap)
|
|||
struct dvb_usb_device *d = adap->dev;
|
||||
struct usb_device *udev = d->udev;
|
||||
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, d->desc->name);
|
||||
mdev = media_device_usb_init(udev, d->desc->name);
|
||||
|
||||
dvb_register_media_controller(&adap->dvb_adap, mdev);
|
||||
|
||||
|
|
|
|||
|
|
@ -3020,11 +3020,11 @@ static int em28xx_media_device_init(struct em28xx *dev,
|
|||
struct media_device *mdev;
|
||||
|
||||
if (udev->product) {
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, udev->product);
|
||||
mdev = media_device_usb_init(udev, udev->product);
|
||||
} else if (udev->manufacturer) {
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, udev->manufacturer);
|
||||
mdev = media_device_usb_init(udev, udev->manufacturer);
|
||||
} else {
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, dev->name);
|
||||
mdev = media_device_usb_init(udev, dev->name);
|
||||
}
|
||||
|
||||
if (!mdev)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <linux/firmware.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
#include <media/v4l2-mc.h>
|
||||
#include <media/media-device.h>
|
||||
|
||||
#include "sms-cards.h"
|
||||
#include "smsendian.h"
|
||||
|
|
@ -367,7 +367,7 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
|
|||
struct sms_board *board = sms_get_board(board_id);
|
||||
int ret;
|
||||
|
||||
mdev = v4l2_mc_usb_media_device_init(udev, board->name);
|
||||
mdev = media_device_usb_init(udev, board->name);
|
||||
if (!mdev)
|
||||
return NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Media Controller ancillary functions
|
||||
*
|
||||
* (c) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
|
||||
* Copyright (c) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -15,83 +15,9 @@
|
|||
*/
|
||||
|
||||
#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,
|
||||
const char *name)
|
||||
{
|
||||
#ifdef CONFIG_PCI
|
||||
struct media_device *mdev;
|
||||
|
||||
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
|
||||
if (!mdev)
|
||||
return NULL;
|
||||
|
||||
mdev->dev = &pci_dev->dev;
|
||||
|
||||
if (name)
|
||||
strlcpy(mdev->model, name, sizeof(mdev->model));
|
||||
else
|
||||
strlcpy(mdev->model, pci_name(pci_dev), sizeof(mdev->model));
|
||||
|
||||
sprintf(mdev->bus_info, "PCI:%s", pci_name(pci_dev));
|
||||
|
||||
mdev->hw_revision = (pci_dev->subsystem_vendor << 16)
|
||||
| pci_dev->subsystem_device;
|
||||
|
||||
mdev->driver_version = LINUX_VERSION_CODE;
|
||||
|
||||
media_device_init(mdev);
|
||||
|
||||
return mdev;
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
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)
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -333,6 +333,10 @@ struct media_device {
|
|||
unsigned int notification);
|
||||
};
|
||||
|
||||
/* We don't need to include pci.h or usb.h here */
|
||||
struct pci_dev;
|
||||
struct usb_device;
|
||||
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER
|
||||
|
||||
/* Supported link_notify @notification values. */
|
||||
|
|
@ -541,6 +545,35 @@ struct media_device *media_device_find_devres(struct device *dev);
|
|||
/* Iterate over all links. */
|
||||
#define media_device_for_each_link(link, mdev) \
|
||||
list_for_each_entry(link, &(mdev)->links, graph_obj.list)
|
||||
|
||||
/**
|
||||
* media_device_pci_init() - create and initialize a
|
||||
* struct &media_device from a PCI device.
|
||||
*
|
||||
* @pci_dev: pointer to struct pci_dev
|
||||
* @name: media device name. If %NULL, the routine will use the default
|
||||
* name for the pci device, given by pci_name() macro.
|
||||
*/
|
||||
struct media_device *media_device_pci_init(struct pci_dev *pci_dev,
|
||||
const char *name);
|
||||
/**
|
||||
* __media_device_usb_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 media_device_usb_init() instead, as
|
||||
* such macro fills driver_name with %KBUILD_MODNAME.
|
||||
*/
|
||||
struct media_device *__media_device_usb_init(struct usb_device *udev,
|
||||
const char *board_name,
|
||||
const char *driver_name);
|
||||
|
||||
#else
|
||||
static inline int media_device_register(struct media_device *mdev)
|
||||
{
|
||||
|
|
@ -565,5 +598,25 @@ static inline struct media_device *media_device_find_devres(struct device *dev)
|
|||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline
|
||||
struct media_device *media_device_pci_init(struct pci_dev *pci_dev,
|
||||
char *name)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline
|
||||
struct media_device *__media_device_usb_init(struct usb_device *udev,
|
||||
char *board_name,
|
||||
char *driver_name)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_MEDIA_CONTROLLER */
|
||||
|
||||
#define media_device_usb_init(udev, name) \
|
||||
__media_device_usb_init(udev, name, KBUILD_MODNAME)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -116,57 +116,11 @@ struct usb_device;
|
|||
*/
|
||||
int v4l2_mc_create_media_graph(struct media_device *mdev);
|
||||
|
||||
/**
|
||||
* v4l2_mc_pci_media_device_init() - create and initialize a
|
||||
* struct &media_device from a PCI device.
|
||||
*
|
||||
* @pci_dev: pointer to struct pci_dev
|
||||
* @name: media device name. If %NULL, the routine will use the default
|
||||
* name for the pci device, given by pci_name() macro.
|
||||
*/
|
||||
struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
|
||||
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)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline
|
||||
struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
|
||||
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
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче