projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cec-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor...
[deliverable/linux.git]
/
drivers
/
mfd
/
tps65010.c
diff --git
a/drivers/mfd/tps65010.c
b/drivers/mfd/tps65010.c
index 495e4518fc2992ff1a757858611f7cf1f3c27b55..d829a6131f09e5de61ecc02b8727fd225cea5232 100644
(file)
--- a/
drivers/mfd/tps65010.c
+++ b/
drivers/mfd/tps65010.c
@@
-34,7
+34,7
@@
#include <linux/i2c/tps65010.h>
#include <linux/i2c/tps65010.h>
-#include <linux/gpio.h>
+#include <linux/gpio
/driver
.h>
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
@@
-477,7
+477,7
@@
tps65010_output(struct gpio_chip *chip, unsigned offset, int value)
if (offset < 4) {
struct tps65010 *tps;
if (offset < 4) {
struct tps65010 *tps;
- tps =
container_of(chip, struct tps65010,
chip);
+ tps =
gpiochip_get_data(
chip);
if (!(tps->outmask & (1 << offset)))
return -EINVAL;
tps65010_set_gpio_out_value(offset + 1, value);
if (!(tps->outmask & (1 << offset)))
return -EINVAL;
tps65010_set_gpio_out_value(offset + 1, value);
@@
-494,7
+494,7
@@
static int tps65010_gpio_get(struct gpio_chip *chip, unsigned offset)
int value;
struct tps65010 *tps;
int value;
struct tps65010 *tps;
- tps =
container_of(chip, struct tps65010,
chip);
+ tps =
gpiochip_get_data(
chip);
if (offset < 4) {
value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
if (offset < 4) {
value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
@@
-651,7
+651,7
@@
static int tps65010_probe(struct i2c_client *client,
tps->chip.ngpio = 7;
tps->chip.can_sleep = 1;
tps->chip.ngpio = 7;
tps->chip.can_sleep = 1;
- status = gpiochip_add
(&tps->chip
);
+ status = gpiochip_add
_data(&tps->chip, tps
);
if (status < 0)
dev_err(&client->dev, "can't add gpiochip, err %d\n",
status);
if (status < 0)
dev_err(&client->dev, "can't add gpiochip, err %d\n",
status);
This page took
0.027746 seconds
and
5
git commands to generate.