diff options
Diffstat (limited to 'drivers/gpio/gpio-palmas.c')
-rw-r--r-- | drivers/gpio/gpio-palmas.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c index da9d33252e56..86bdbe362068 100644 --- a/drivers/gpio/gpio-palmas.c +++ b/drivers/gpio/gpio-palmas.c | |||
@@ -148,7 +148,7 @@ static const struct palmas_device_data tps80036_dev_data = { | |||
148 | .ngpio = 16, | 148 | .ngpio = 16, |
149 | }; | 149 | }; |
150 | 150 | ||
151 | static struct of_device_id of_palmas_gpio_match[] = { | 151 | static const struct of_device_id of_palmas_gpio_match[] = { |
152 | { .compatible = "ti,palmas-gpio", .data = &palmas_dev_data,}, | 152 | { .compatible = "ti,palmas-gpio", .data = &palmas_dev_data,}, |
153 | { .compatible = "ti,tps65913-gpio", .data = &palmas_dev_data,}, | 153 | { .compatible = "ti,tps65913-gpio", .data = &palmas_dev_data,}, |
154 | { .compatible = "ti,tps65914-gpio", .data = &palmas_dev_data,}, | 154 | { .compatible = "ti,tps65914-gpio", .data = &palmas_dev_data,}, |
@@ -173,10 +173,8 @@ static int palmas_gpio_probe(struct platform_device *pdev) | |||
173 | 173 | ||
174 | palmas_gpio = devm_kzalloc(&pdev->dev, | 174 | palmas_gpio = devm_kzalloc(&pdev->dev, |
175 | sizeof(*palmas_gpio), GFP_KERNEL); | 175 | sizeof(*palmas_gpio), GFP_KERNEL); |
176 | if (!palmas_gpio) { | 176 | if (!palmas_gpio) |
177 | dev_err(&pdev->dev, "Could not allocate palmas_gpio\n"); | ||
178 | return -ENOMEM; | 177 | return -ENOMEM; |
179 | } | ||
180 | 178 | ||
181 | palmas_gpio->palmas = palmas; | 179 | palmas_gpio->palmas = palmas; |
182 | palmas_gpio->gpio_chip.owner = THIS_MODULE; | 180 | palmas_gpio->gpio_chip.owner = THIS_MODULE; |