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

Commit 500c3201 authored by Du, Changbin's avatar Du, Changbin Committed by Mauro Carvalho Chehab
Browse files

[media] media: gpio-ir-recv: add allowed_protos for platform data 



It's better to give platform code a chance to specify the allowed
protocols to use.

[mchehab@redhat.com: fix merge conflict with a patch that made
 half of this change]
Signed-off-by: default avatarDu, Changbin <changbin.du@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 87e94294

drivers/media/rc/gpio-ir-recv.c

+4 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev) 


	rcdev->priv = gpio_dev;

	rcdev->driver_type = RC_DRIVER_IR_RAW;

	rcdev->allowed_protos = RC_TYPE_ALL;

	rcdev->input_name = GPIO_IR_DEVICE_NAME;

	rcdev->input_phys = GPIO_IR_DEVICE_NAME "/input0";

	rcdev->input_id.bustype = BUS_HOST;
@@ -93,6 +92,10 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev) 
	rcdev->input_id.version = 0x0100;

	rcdev->dev.parent = &pdev->dev;

	rcdev->driver_name = GPIO_IR_DRIVER_NAME;

	if (pdata->allowed_protos)

		rcdev->allowed_protos = pdata->allowed_protos;

	else

		rcdev->allowed_protos = RC_TYPE_ALL;

	rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;



	gpio_dev->rcdev = rcdev;

include/media/gpio-ir-recv.h

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
struct gpio_ir_recv_platform_data {

	int		gpio_nr;

	bool		active_low;

	u64		allowed_protos;

	const char	*map_name;

};