aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/media-device.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-22 12:10:49 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-23 07:19:39 -0300
commit6cf5dad17e913fce1ccb0c38e199eff15b0f03cc (patch)
treeb039fae16d8290e8d54e4e614a1a0fb3dfd7e34a /drivers/media/media-device.c
parent41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa (diff)
[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>
Diffstat (limited to 'drivers/media/media-device.c')
-rw-r--r--drivers/media/media-device.c32
1 files changed, 7 insertions, 25 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index fe376b6b5244..6613723f5eb8 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -755,16 +755,11 @@ 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)
+void media_device_pci_init(struct media_device *mdev,
+ 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)
@@ -780,25 +775,16 @@ struct media_device *media_device_pci_init(struct pci_dev *pci_dev,
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)
+void __media_device_usb_init(struct media_device *mdev,
+ 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)
@@ -818,10 +804,6 @@ struct media_device *__media_device_usb_init(struct usb_device *udev,
mdev->driver_version = LINUX_VERSION_CODE;
media_device_init(mdev);
-
- return mdev;
-#else
- return NULL;
#endif
}
EXPORT_SYMBOL_GPL(__media_device_usb_init);

Privacy Policy