hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] media_device: move allocation out of media_device_*_init 

Right now, media_device_pci_init and media_device_usb_init does
media_device allocation internaly. That preents its usage when
the media_device struct is embedded on some other structure.

Move memory allocation outside it, to make it more generic.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-02-22 12:10:49 -03:00
parent 41b44e35ba
commit 6cf5dad17e
9 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/media/media-device.c
View File

@ -755,16 +755,11 @@ struct media_device *media_device_find_devres(struct device *dev)
} }
EXPORT_SYMBOL_GPL(media_device_find_devres); EXPORT_SYMBOL_GPL(media_device_find_devres);
struct media_device *media_device_pci_init(struct pci_dev *pci_dev, void media_device_pci_init(struct media_device *mdev,
const char *name) struct pci_dev *pci_dev,
const char *name)
{ {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct media_device *mdev;
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev)
return NULL;
mdev->dev = &pci_dev->dev; mdev->dev = &pci_dev->dev;
if (name) if (name)
@ -780,25 +775,16 @@ struct media_device *media_device_pci_init(struct pci_dev *pci_dev,
mdev->driver_version = LINUX_VERSION_CODE; mdev->driver_version = LINUX_VERSION_CODE;
media_device_init(mdev); media_device_init(mdev);
return mdev;
#else
return NULL;
#endif #endif
} }
EXPORT_SYMBOL_GPL(media_device_pci_init); EXPORT_SYMBOL_GPL(media_device_pci_init);
struct media_device *__media_device_usb_init(struct usb_device *udev, void __media_device_usb_init(struct media_device *mdev,
const char *board_name, struct usb_device *udev,
const char *driver_name) const char *board_name,
const char *driver_name)
{ {
#ifdef CONFIG_USB #ifdef CONFIG_USB
struct media_device *mdev;
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev)
return NULL;
mdev->dev = &udev->dev; mdev->dev = &udev->dev;
if (driver_name) if (driver_name)
@ -818,10 +804,6 @@ struct media_device *__media_device_usb_init(struct usb_device *udev,
mdev->driver_version = LINUX_VERSION_CODE; mdev->driver_version = LINUX_VERSION_CODE;
media_device_init(mdev); media_device_init(mdev);
return mdev;
#else
return NULL;
#endif #endif
} }
EXPORT_SYMBOL_GPL(__media_device_usb_init); EXPORT_SYMBOL_GPL(__media_device_usb_init);

3
drivers/media/pci/saa7134/saa7134-core.c
View File

@ -1043,11 +1043,12 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
sprintf(dev->name, "saa%x[%d]", pci_dev->device, dev->nr); sprintf(dev->name, "saa%x[%d]", pci_dev->device, dev->nr);
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
dev->media_dev = media_device_pci_init(pci_dev, dev->name); dev->media_dev = kzalloc(sizeof(*dev->media_dev), GFP_KERNEL);
if (!dev->media_dev) { if (!dev->media_dev) {
err = -ENOMEM; err = -ENOMEM;
goto fail0; goto fail0;
} }
media_device_pci_init(dev->media_dev, pci_dev, dev->name);
dev->v4l2_dev.mdev = dev->media_dev; dev->v4l2_dev.mdev = dev->media_dev;
#endif #endif

10
drivers/media/usb/au0828/au0828-core.c
View File

@ -191,13 +191,15 @@ static int au0828_media_device_init(struct au0828_dev *dev,
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev; struct media_device *mdev;
if (!dev->board.name) mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
mdev = media_device_usb_init(udev, "unknown au0828");
else
mdev = media_device_usb_init(udev, dev->board.name);
if (!mdev) if (!mdev)
return -ENOMEM; return -ENOMEM;
if (!dev->board.name)
media_device_usb_init(mdev, udev, "unknown au0828");
else
media_device_usb_init(mdev, udev, dev->board.name);
dev->media_dev = mdev; dev->media_dev = mdev;
#endif #endif
return 0; return 0;

4
drivers/media/usb/cx231xx/cx231xx-cards.c
View File

@ -1212,10 +1212,12 @@ static int cx231xx_media_device_init(struct cx231xx *dev,
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev; struct media_device *mdev;
mdev = media_device_usb_init(udev, dev->board.name); mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev) if (!mdev)
return -ENOMEM; return -ENOMEM;
media_device_usb_init(mdev, udev, dev->board.name);
dev->media_dev = mdev; dev->media_dev = mdev;
#endif #endif
return 0; return 0;

4
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
View File

@ -408,10 +408,12 @@ static int dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap)
struct dvb_usb_device *d = adap_to_d(adap); struct dvb_usb_device *d = adap_to_d(adap);
struct usb_device *udev = d->udev; struct usb_device *udev = d->udev;
mdev = media_device_usb_init(udev, d->name); mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev) if (!mdev)
return -ENOMEM; return -ENOMEM;
media_device_usb_init(mdev, udev, d->name);
dvb_register_media_controller(&adap->dvb_adap, mdev); dvb_register_media_controller(&adap->dvb_adap, mdev);
dev_info(&d->udev->dev, "media controller created\n"); dev_info(&d->udev->dev, "media controller created\n");

6
drivers/media/usb/dvb-usb/dvb-usb-dvb.c
View File

@ -103,7 +103,11 @@ static int dvb_usb_media_device_init(struct dvb_usb_adapter *adap)
struct dvb_usb_device *d = adap->dev; struct dvb_usb_device *d = adap->dev;
struct usb_device *udev = d->udev; struct usb_device *udev = d->udev;
mdev = media_device_usb_init(udev, d->desc->name); mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev)
return -ENOMEM;
media_device_usb_init(mdev, udev, d->desc->name);
dvb_register_media_controller(&adap->dvb_adap, mdev); dvb_register_media_controller(&adap->dvb_adap, mdev);

16
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -3019,17 +3019,17 @@ static int em28xx_media_device_init(struct em28xx *dev,
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev; struct media_device *mdev;
if (udev->product) { mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
mdev = media_device_usb_init(udev, udev->product);
} else if (udev->manufacturer) {
mdev = media_device_usb_init(udev, udev->manufacturer);
} else {
mdev = media_device_usb_init(udev, dev->name);
}
if (!mdev) if (!mdev)
return -ENOMEM; return -ENOMEM;
if (udev->product)
media_device_usb_init(mdev, udev, udev->product);
else if (udev->manufacturer)
media_device_usb_init(mdev, udev, udev->manufacturer);
else
media_device_usb_init(mdev, udev, dev->name);
dev->media_dev = mdev; dev->media_dev = mdev;
#endif #endif
return 0; return 0;

4
drivers/media/usb/siano/smsusb.c
View File

@ -367,10 +367,12 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
struct sms_board *board = sms_get_board(board_id); struct sms_board *board = sms_get_board(board_id);
int ret; int ret;
mdev = media_device_usb_init(udev, board->name); mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev) if (!mdev)
return NULL; return NULL;
media_device_usb_init(mdev, udev, board->name);
ret = media_device_register(mdev); ret = media_device_register(mdev);
if (ret) { if (ret) {
media_device_cleanup(mdev); media_device_cleanup(mdev);

32
include/media/media-device.h
View File

@ -550,16 +550,19 @@ struct media_device *media_device_find_devres(struct device *dev);
* media_device_pci_init() - create and initialize a * media_device_pci_init() - create and initialize a
* struct &media_device from a PCI device. * struct &media_device from a PCI device.
* *
* @mdev: pointer to struct &media_device
* @pci_dev: pointer to struct pci_dev * @pci_dev: pointer to struct pci_dev
* @name: media device name. If %NULL, the routine will use the default * @name: media device name. If %NULL, the routine will use the default
* name for the pci device, given by pci_name() macro. * name for the pci device, given by pci_name() macro.
*/ */
struct media_device *media_device_pci_init(struct pci_dev *pci_dev, void media_device_pci_init(struct media_device *mdev,
const char *name); struct pci_dev *pci_dev,
const char *name);
/** /**
* __media_device_usb_init() - create and initialize a * __media_device_usb_init() - create and initialize a
* struct &media_device from a PCI device. * struct &media_device from a PCI device.
* *
* @mdev: pointer to struct &media_device
* @udev: pointer to struct usb_device * @udev: pointer to struct usb_device
* @board_name: media device name. If %NULL, the routine will use the usb * @board_name: media device name. If %NULL, the routine will use the usb
* product name, if available. * product name, if available.
@ -570,9 +573,10 @@ struct media_device *media_device_pci_init(struct pci_dev *pci_dev,
* NOTE: It is better to call media_device_usb_init() instead, as * NOTE: It is better to call media_device_usb_init() instead, as
* such macro fills driver_name with %KBUILD_MODNAME. * such macro fills driver_name with %KBUILD_MODNAME.
*/ */
struct media_device *__media_device_usb_init(struct usb_device *udev, void __media_device_usb_init(struct media_device *mdev,
const char *board_name, struct usb_device *udev,
const char *driver_name); const char *board_name,
const char *driver_name);
#else #else
static inline int media_device_register(struct media_device *mdev) static inline int media_device_register(struct media_device *mdev)
@ -599,24 +603,24 @@ static inline struct media_device *media_device_find_devres(struct device *dev)
return NULL; return NULL;
} }
static inline static inline void media_device_pci_init(struct media_device *mdev,
struct media_device *media_device_pci_init(struct pci_dev *pci_dev, struct pci_dev *pci_dev,
char *name) char *name)
{ {
return NULL; return NULL;
} }
static inline static inline void __media_device_usb_init(struct media_device *mdev,
struct media_device *__media_device_usb_init(struct usb_device *udev, struct usb_device *udev,
char *board_name, char *board_name,
char *driver_name) char *driver_name)
{ {
return NULL; return NULL;
} }
#endif /* CONFIG_MEDIA_CONTROLLER */ #endif /* CONFIG_MEDIA_CONTROLLER */
#define media_device_usb_init(udev, name) \ #define media_device_usb_init(mdev, udev, name) \
__media_device_usb_init(udev, name, KBUILD_MODNAME) __media_device_usb_init(mdev, udev, name, KBUILD_MODNAME)
#endif #endif