aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-09-09 08:19:25 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 12:19:02 -0200
commit0b3b72df9018c0386293c2f529b91ed17448288a (patch)
treedeadf2b108f3b6803844315c224ba7688cd7ef70
parent8ed071426ee48879024c350ae92fc41062039b13 (diff)
download96b-common-0b3b72df9018c0386293c2f529b91ed17448288a.tar.gz
[media] media_entity: remove gfp_flags argument
We should not be creating device nodes at IRQ contexts. So, the only flags we'll be using will be GFP_KERNEL. Let's remove the gfp_flags, in order to make the interface simpler. If we ever need it, it would be easy to revert those changes. While here, remove an extra blank line. Suggested-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/dvb-core/dvbdev.c3
-rw-r--r--drivers/media/media-entity.c5
-rw-r--r--drivers/media/v4l2-core/v4l2-dev.c3
-rw-r--r--include/media/media-entity.h4
4 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index cc52c24bff72..1d4e35693d09 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -394,8 +394,7 @@ static int dvb_register_media_device(struct dvb_device *dvbdev,
dvbdev->intf_devnode = media_devnode_create(dvbdev->adapter->mdev,
intf_type, 0,
- DVB_MAJOR, minor,
- GFP_KERNEL);
+ DVB_MAJOR, minor);
if (!dvbdev->intf_devnode)
return -ENOMEM;
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 246d7e65aded..5f61642b2a97 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -866,12 +866,11 @@ static void media_interface_init(struct media_device *mdev,
struct media_intf_devnode *media_devnode_create(struct media_device *mdev,
u32 type, u32 flags,
- u32 major, u32 minor,
- gfp_t gfp_flags)
+ u32 major, u32 minor)
{
struct media_intf_devnode *devnode;
- devnode = kzalloc(sizeof(*devnode), gfp_flags);
+ devnode = kzalloc(sizeof(*devnode), GFP_KERNEL);
if (!devnode)
return NULL;
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index ed96642c27bf..d8e5994cccf1 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -786,8 +786,7 @@ static int video_register_media_controller(struct video_device *vdev, int type)
vdev->intf_devnode = media_devnode_create(vdev->v4l2_dev->mdev,
intf_type,
0, VIDEO_MAJOR,
- vdev->minor,
- GFP_KERNEL);
+ vdev->minor);
if (!vdev->intf_devnode) {
media_device_unregister_entity(&vdev->entity);
return -ENOMEM;
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index df84e8eeb24b..cd3f3a77df2d 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -71,7 +71,6 @@ struct media_gobj {
struct list_head list;
};
-
struct media_pipeline {
};
@@ -378,8 +377,7 @@ void media_entity_pipeline_stop(struct media_entity *entity);
struct media_intf_devnode *
__must_check media_devnode_create(struct media_device *mdev,
u32 type, u32 flags,
- u32 major, u32 minor,
- gfp_t gfp_flags);
+ u32 major, u32 minor);
void media_devnode_remove(struct media_intf_devnode *devnode);
struct media_link *
__must_check media_create_intf_link(struct media_entity *entity,