Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b3b72df authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8ed07142

drivers/media/dvb-core/dvbdev.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/media-entity.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

drivers/media/v4l2-core/v4l2-dev.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

include/media/media-entity.h

+1 −3
Original line number Diff line number Diff line
@@ -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,