The patch titled
sm501: fixes for akpms comments on gpiolib addition
has been removed from the -mm tree. Its filename was
sm501-fixes-for-akpms-comments-on-gpiolib-addition.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sm501: fixes for akpms comments on gpiolib addition
From: Ben Dooks <ben-linux@xxxxxxxxx>
Fixup the comments from the patch that added the gpiolib support from
Andrew Morton. These include spotting some missing frees on error or
release, and changing a memcpy for a type-safe assingment.
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mfd/sm501.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff -puN drivers/mfd/sm501.c~sm501-fixes-for-akpms-comments-on-gpiolib-addition drivers/mfd/sm501.c
--- a/drivers/mfd/sm501.c~sm501-fixes-for-akpms-comments-on-gpiolib-addition
+++ a/drivers/mfd/sm501.c
@@ -999,7 +999,7 @@ static int __devinit sm501_gpio_register
struct gpio_chip *gchip = &chip->gpio;
int base = pdata->gpio_base;
- memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip));
+ chip->gpio = gpio_chip_template;
if (chip == &gpio->high) {
if (base > 0)
@@ -1039,7 +1039,7 @@ static int sm501_register_gpio(struct sm
if (gpio->regs == NULL) {
dev_err(sm->dev, "gpio: failed to remap registers\n");
ret = -ENXIO;
- goto err_mapped;
+ goto err_claimed;
}
/* Register both our chips. */
@@ -1068,6 +1068,9 @@ static int sm501_register_gpio(struct sm
}
err_mapped:
+ iounmap(gpio->regs);
+
+ err_claimed:
release_resource(gpio->regs_res);
kfree(gpio->regs_res);
@@ -1076,33 +1079,38 @@ static int sm501_register_gpio(struct sm
static void sm501_gpio_remove(struct sm501_devdata *sm)
{
+ struct sm501_gpio *gpio = &sm->gpio;
int ret;
- ret = gpiochip_remove(&sm->gpio.low.gpio);
+ ret = gpiochip_remove(&gpio->low.gpio);
if (ret)
dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");
- ret = gpiochip_remove(&sm->gpio.high.gpio);
+ ret = gpiochip_remove(&gpio->high.gpio);
if (ret)
dev_err(sm->dev, "cannot remove high chip, cannot tidy up\n");
+
+ iounmap(gpio->regs);
+ release_resource(gpio->regs_res);
+ kfree(gpio->regs_res);
}
-static int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
+static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
{
struct sm501_gpio *gpio = &sm->gpio;
return pin + (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base;
}
#else
-static int sm501_register_gpio(struct sm501_devdata *sm)
+static inline int sm501_register_gpio(struct sm501_devdata *sm)
{
return 0;
}
-static void sm501_gpio_remove(struct sm501_devdata *sm)
+static inline void sm501_gpio_remove(struct sm501_devdata *sm)
{
}
-static int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
+static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin)
{
return -1;
}
_
Patches currently in -mm which might be from ben-linux@xxxxxxxxx are
origin.patch
linux-next.patch
resource-add-resource_size.patch
resource-add-resource_type-and-ioresource_type_bits.patch
resource-add-new-ioresource_clk-type-v2.patch
i2c-sh_mobile-ioresource_clk-support.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
