On Jan 9, 2012, at 14:22, Dmitry Torokhov wrote:
> On Mon, Jan 09, 2012 at 02:15:26PM -0500, Jean-François Dagenais wrote:
>>
>> Signed-off-by: Jean-François Dagenais <jeff.dagenais@xxxxxxxxx>
>> Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
>> ---
>> drivers/input/keyboard/adp5588-keys.c | 1 +
>> include/linux/i2c/adp5588.h | 1 +
>> 2 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
>> index e34eeb8..6412ced 100644
>> --- a/drivers/input/keyboard/adp5588-keys.c
>> +++ b/drivers/input/keyboard/adp5588-keys.c
>> @@ -197,6 +197,7 @@ static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
>> kpad->gc.base = gpio_data->gpio_start;
>> kpad->gc.label = kpad->client->name;
>> kpad->gc.owner = THIS_MODULE;
>> + kpad->gc.names = gpio_data->names;
>>
>> mutex_init(&kpad->gpio_lock);
>>
>> diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
>> index cec17cf..d8341cb 100644
>> --- a/include/linux/i2c/adp5588.h
>> +++ b/include/linux/i2c/adp5588.h
>> @@ -157,6 +157,7 @@ struct i2c_client; /* forward declaration */
>>
>> struct adp5588_gpio_platform_data {
>> int gpio_start; /* GPIO Chip base # */
>> + const char *const *names;
>
> I think it is 1 const too much - you won't be able to use non-statioc
> initialization...
The following code (compiles without warning using gcc version 4.6.1) works as expected
#include <stdio.h>
#include <malloc.h>
struct adp5588_gpio_platform_data {
const char const*const* names;
};
int main(void)
{
struct adp5588_gpio_platform_data s;
char const* str_tbl[2];
const char str0[10] = "string 0";
const char str1[10] = "string 1";
str_tbl[0] = str0;
str_tbl[1] = str1;
s.names = str_tbl;
printf("tbl index 0: \"%s\"\n", s.names[0]);
printf("tbl index 1: \"%s\"\n", s.names[1]);
return 0;
}
terminal output:
tbl index 0:string 0
tbl index 1:string 1
Do I need to resend the patches? Do I need to forward to "linux-kernel"?
>
> --
> Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
