Re: [git:media_tree/master] [media] Add device tree support to adp1653 flash driver

[Hans Verkuil <hverkuil@xs4all.nl>]

On 04/09/2015 09:30 AM, Pavel Machek wrote:
> Hi!
> 
>> Hi Pawel,
> 
> Me?

Oops, sorry. I meant Pavel. Apologies for misspelling your name.

> 
>> This driver doesn't compile:
>>
>> On 04/08/2015 10:46 PM, Mauro Carvalho Chehab wrote:
>>> This is an automatic generated email to let you know that the following patch were queued at the 
>>> http://git.linuxtv.org/cgit.cgi/media_tree.git tree:
>>>
> 
>>> --- a/drivers/media/i2c/adp1653.c
>>> +++ b/drivers/media/i2c/adp1653.c
>>> @@ -306,9 +309,17 @@ adp1653_init_device(struct adp1653_flash *flash)
>>>  static int
>>>  __adp1653_set_power(struct adp1653_flash *flash, int on)
>>>  {
>>> -	int ret;
>>> +	int ret = 0;
>>> +
>>> +	if (flash->platform_data->power) {
>>> +		ret = flash->platform_data->power(&flash->subdev, on);
>>> +	} else {
>>> +		gpio_set_value(flash->platform_data->power_gpio, on);
>>
>> The power_gpio field is not found in struct adp1653_platform_data.
> 
> Yes, int power_gpio should be added into that struct.
> 
>> Can you fix this?
>>
>> I'm also getting this warning:
> 
> Well, old version of patch was merged while new versions were getting
> discussed / developed in another mail thread.
> 
> I guess best course of action is to drop this from Mauro's tree, as
> conflicting patch exists in Sakari's tree...?

Sakari, do you agree? How did this patch manage to be merged? Was it not
marked Superseded?

Regards,

	Hans