From b7e194a3660b539867999abeb2b8e398e57a473d Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Sat, 19 May 2012 02:01:42 +0530 Subject: [PATCH] --- yaml --- r: 308782 b: refs/heads/master c: dcc7dabd8eb13e968ee3ec52a1bb9829a3bc904e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65910.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index c28c4524da9f..0f9c5510c482 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb8d8654570c257d2ec5f7fa089e18b338314317 +refs/heads/master: dcc7dabd8eb13e968ee3ec52a1bb9829a3bc904e diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c index 05d449b33693..be9e07b77325 100644 --- a/trunk/drivers/mfd/tps65910.c +++ b/trunk/drivers/mfd/tps65910.c @@ -146,9 +146,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, struct tps65910_board *board_info; unsigned int prop; const struct of_device_id *match; - unsigned int prop_array[TPS6591X_MAX_NUM_GPIO]; int ret = 0; - int idx; match = of_match_device(tps65910_of_match, &client->dev); if (!match) { @@ -177,21 +175,8 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, else if (*chip_id == TPS65911) dev_warn(&client->dev, "VMBCH2-Threshold not specified"); - ret = of_property_read_u32_array(np, "ti,en-gpio-sleep", - prop_array, TPS6591X_MAX_NUM_GPIO); - if (!ret) - for (idx = 0; idx < ARRAY_SIZE(prop_array); idx++) - board_info->en_gpio_sleep[idx] = (prop_array[idx] != 0); - else if (ret != -EINVAL) { - dev_err(&client->dev, - "error reading property ti,en-gpio-sleep: %d\n.", ret); - return NULL; - } - - board_info->irq = client->irq; board_info->irq_base = -1; - board_info->gpio_base = -1; return board_info; }