Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308782
b: refs/heads/master
c: dcc7dab
h: refs/heads/master
v: v3
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed May 22, 2012
1 parent bd00f76 commit b7e194a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb8d8654570c257d2ec5f7fa089e18b338314317
refs/heads/master: dcc7dabd8eb13e968ee3ec52a1bb9829a3bc904e
15 changes: 0 additions & 15 deletions trunk/drivers/mfd/tps65910.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b7e194a

Please sign in to comment.