git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
gpio.c
diff --git
a/arch/arm/mach-omap2/gpio.c
b/arch/arm/mach-omap2/gpio.c
index
2765cdc
..
652ccc5
100644
(file)
--- a/
arch/arm/mach-omap2/gpio.c
+++ b/
arch/arm/mach-omap2/gpio.c
@@
-34,7
+34,7
@@
static struct omap_device_pm_latency omap_gpio_latency[] = {
static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
{
static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
{
- struct
omap_device *od
;
+ struct
platform_device *pdev
;
struct omap_gpio_platform_data *pdata;
struct omap_gpio_dev_attr *dev_attr;
char *name = "omap_gpio";
struct omap_gpio_platform_data *pdata;
struct omap_gpio_dev_attr *dev_attr;
char *name = "omap_gpio";
@@
-107,19
+107,19
@@
static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
return -EINVAL;
}
return -EINVAL;
}
-
od
= omap_device_build(name, id - 1, oh, pdata,
+
pdev
= omap_device_build(name, id - 1, oh, pdata,
sizeof(*pdata), omap_gpio_latency,
ARRAY_SIZE(omap_gpio_latency),
false);
kfree(pdata);
sizeof(*pdata), omap_gpio_latency,
ARRAY_SIZE(omap_gpio_latency),
false);
kfree(pdata);
- if (IS_ERR(
od
)) {
+ if (IS_ERR(
pdev
)) {
WARN(1, "Can't build omap_device for %s:%s.\n",
name, oh->name);
WARN(1, "Can't build omap_device for %s:%s.\n",
name, oh->name);
- return PTR_ERR(
od
);
+ return PTR_ERR(
pdev
);
}
}
- omap_device_disable_idle_on_suspend(
od
);
+ omap_device_disable_idle_on_suspend(
pdev
);
gpio_bank_count++;
return 0;
gpio_bank_count++;
return 0;