Re: [PATCH v2 1/1] media: gpio-ir-recv: add allowed_protos for platformdata

[Mauro Carvalho Chehab]

Em 04-07-2012 00:11, Du, Changbin escreveu:
> Make it possible to specify allowed RC protocols through the device's
> platform data.
> 
> Signed-off-by: Du, Changbin <changbin.du@xxxxxxxxx>

Gah, you trapped me: you've resent it, without using the original message ID.

Too late. I'll keep the version where I've fixed the merge
conflict, as it does the same thing.

Regards,
Mauro.

> ---
> For v2:
> 	Keymap has already done by another patch.
> ---
>   drivers/media/rc/gpio-ir-recv.c |    2 +-
>   include/media/gpio-ir-recv.h    |    7 ++++---
>   2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/rc/gpio-ir-recv.c
> b/drivers/media/rc/gpio-ir-recv.c
> index 59fe60c..38da91e 100644
> --- a/drivers/media/rc/gpio-ir-recv.c
> +++ b/drivers/media/rc/gpio-ir-recv.c
> @@ -84,7 +84,7 @@ 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->allowed_protos = pdata->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;
> diff --git a/include/media/gpio-ir-recv.h b/include/media/gpio-ir-recv.h
> index 91546f3..0142736 100644
> --- a/include/media/gpio-ir-recv.h
> +++ b/include/media/gpio-ir-recv.h
> @@ -14,9 +14,10 @@
>   #define __GPIO_IR_RECV_H__
>   
>   struct gpio_ir_recv_platform_data {
> -	int gpio_nr;
> -	bool active_low;
> -	const char *map_name;
> +	int		gpio_nr;
> +	bool		active_low;
> +	u64		allowed_protos;
> +	const char	*map_name;
>   };
>   
>   #endif /* __GPIO_IR_RECV_H__ */
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/