aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-omap.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
-rw-r--r--drivers/gpio/gpio-omap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index d335af1d4d85..f1fbedb2a6f9 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1012,7 +1012,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
1012 dev_err(bank->dev, "Could not get gpio dbck\n"); 1012 dev_err(bank->dev, "Could not get gpio dbck\n");
1013} 1013}
1014 1014
1015static __devinit void 1015static void
1016omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start, 1016omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
1017 unsigned int num) 1017 unsigned int num)
1018{ 1018{
@@ -1041,7 +1041,7 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
1041 IRQ_NOREQUEST | IRQ_NOPROBE, 0); 1041 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
1042} 1042}
1043 1043
1044static void __devinit omap_gpio_chip_init(struct gpio_bank *bank) 1044static void omap_gpio_chip_init(struct gpio_bank *bank)
1045{ 1045{
1046 int j; 1046 int j;
1047 static int gpio; 1047 static int gpio;
@@ -1089,7 +1089,7 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
1089 1089
1090static const struct of_device_id omap_gpio_match[]; 1090static const struct of_device_id omap_gpio_match[];
1091 1091
1092static int __devinit omap_gpio_probe(struct platform_device *pdev) 1092static int omap_gpio_probe(struct platform_device *pdev)
1093{ 1093{
1094 struct device *dev = &pdev->dev; 1094 struct device *dev = &pdev->dev;
1095 struct device_node *node = dev->of_node; 1095 struct device_node *node = dev->of_node;
@@ -1105,7 +1105,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
1105 if (!pdata) 1105 if (!pdata)
1106 return -EINVAL; 1106 return -EINVAL;
1107 1107
1108 bank = devm_kzalloc(&pdev->dev, sizeof(struct gpio_bank), GFP_KERNEL); 1108 bank = devm_kzalloc(dev, sizeof(struct gpio_bank), GFP_KERNEL);
1109 if (!bank) { 1109 if (!bank) {
1110 dev_err(dev, "Memory alloc failed\n"); 1110 dev_err(dev, "Memory alloc failed\n");
1111 return -ENOMEM; 1111 return -ENOMEM;