projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mfd: tc3589x: Add device tree bindings
[cascardo/linux.git]
/
drivers
/
mfd
/
htc-i2cpld.c
diff --git
a/drivers/mfd/htc-i2cpld.c
b/drivers/mfd/htc-i2cpld.c
index
d7b2a75
..
6bdb78c
100644
(file)
--- a/
drivers/mfd/htc-i2cpld.c
+++ b/
drivers/mfd/htc-i2cpld.c
@@
-332,18
+332,13
@@
static int htcpld_setup_chip_irq(
int chip_index)
{
struct htcpld_data *htcpld;
int chip_index)
{
struct htcpld_data *htcpld;
- struct device *dev = &pdev->dev;
- struct htcpld_core_platform_data *pdata;
struct htcpld_chip *chip;
struct htcpld_chip *chip;
- struct htcpld_chip_platform_data *plat_chip_data;
unsigned int irq, irq_end;
int ret = 0;
/* Get the platform and driver data */
unsigned int irq, irq_end;
int ret = 0;
/* Get the platform and driver data */
- pdata = dev_get_platdata(dev);
htcpld = platform_get_drvdata(pdev);
chip = &htcpld->chip[chip_index];
htcpld = platform_get_drvdata(pdev);
chip = &htcpld->chip[chip_index];
- plat_chip_data = &pdata->chip[chip_index];
/* Setup irq handlers */
irq_end = chip->irq_start + chip->nirqs;
/* Setup irq handlers */
irq_end = chip->irq_start + chip->nirqs;
@@
-409,7
+404,7
@@
static int htcpld_register_chip_i2c(
}
i2c_set_clientdata(client, chip);
}
i2c_set_clientdata(client, chip);
- snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%
d
", client->addr);
+ snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%
x
", client->addr);
chip->client = client;
/* Reset the chip */
chip->client = client;
/* Reset the chip */