projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-twl6040.c
diff --git
a/drivers/gpio/gpio-twl6040.c
b/drivers/gpio/gpio-twl6040.c
index 0be82c6dd796cf5e0daac94f1804afcef8750273..d420d30b86e73233314b74f36d8412b4e0c01166 100644
(file)
--- a/
drivers/gpio/gpio-twl6040.c
+++ b/
drivers/gpio/gpio-twl6040.c
@@
-84,15
+84,11
@@
static struct gpio_chip twl6040gpo_chip = {
static int gpo_twl6040_probe(struct platform_device *pdev)
{
static int gpo_twl6040_probe(struct platform_device *pdev)
{
- struct twl6040_gpo_data *pdata = pdev->dev.platform_data;
struct device *twl6040_core_dev = pdev->dev.parent;
struct twl6040 *twl6040 = dev_get_drvdata(twl6040_core_dev);
int ret;
struct device *twl6040_core_dev = pdev->dev.parent;
struct twl6040 *twl6040 = dev_get_drvdata(twl6040_core_dev);
int ret;
- if (pdata)
- twl6040gpo_chip.base = pdata->gpio_base;
- else
- twl6040gpo_chip.base = -1;
+ twl6040gpo_chip.base = -1;
if (twl6040_get_revid(twl6040) < TWL6041_REV_ES2_0)
twl6040gpo_chip.ngpio = 3; /* twl6040 have 3 GPO */
if (twl6040_get_revid(twl6040) < TWL6041_REV_ES2_0)
twl6040gpo_chip.ngpio = 3; /* twl6040 have 3 GPO */