From 705a6274362c6b2dd236074cc0d91eb0ba565a45 Mon Sep 17 00:00:00 2001 From: Luo Wei Date: Tue, 13 May 2025 12:12:29 +0800 Subject: [PATCH] mfd: display-serdes: fix kmemleak warning from kasprintf Signed-off-by: Luo Wei Change-Id: Icc4fc3f40f6b96f35ff4b21c2263f0870745361c --- drivers/mfd/display-serdes/serdes-gpio.c | 6 +++--- drivers/mfd/display-serdes/serdes-pinctrl.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/display-serdes/serdes-gpio.c b/drivers/mfd/display-serdes/serdes-gpio.c index 20b61d30f14b..1c49cf55fc28 100644 --- a/drivers/mfd/display-serdes/serdes-gpio.c +++ b/drivers/mfd/display-serdes/serdes-gpio.c @@ -42,10 +42,9 @@ static void serdes_gpio_set(struct gpio_chip *chip, unsigned int offset, int val { struct serdes_gpio *serdes_gpio = gpiochip_get_data(chip); struct serdes *serdes = serdes_gpio->parent->parent; - int ret = 0; if (serdes->chip_data->gpio_ops->set_level) - ret = serdes->chip_data->gpio_ops->set_level(serdes, offset, value); + serdes->chip_data->gpio_ops->set_level(serdes, offset, value); SERDES_DBG_MFD("%s: %s %s gpio=%d,val=%d\n", __func__, dev_name(serdes->dev), serdes->chip_data->name, offset, value); @@ -185,7 +184,8 @@ static int serdes_gpio_probe(struct platform_device *pdev) #ifdef CONFIG_OF_GPIO serdes_gpio->gpio_chip.of_node = serdes_gpio->dev->of_node; #endif - serdes_gpio->gpio_chip.label = kasprintf(GFP_KERNEL, "%s-gpio", chip_data->name); + serdes_gpio->gpio_chip.label = devm_kasprintf(serdes_gpio->dev, GFP_KERNEL, + "%s-gpio", chip_data->name); /* Add gpiochip */ ret = devm_gpiochip_add_data(&pdev->dev, &serdes_gpio->gpio_chip, diff --git a/drivers/mfd/display-serdes/serdes-pinctrl.c b/drivers/mfd/display-serdes/serdes-pinctrl.c index eeb8a6803ddc..27605732ff66 100644 --- a/drivers/mfd/display-serdes/serdes-pinctrl.c +++ b/drivers/mfd/display-serdes/serdes-pinctrl.c @@ -282,7 +282,7 @@ static int serdes_pinctrl_probe(struct platform_device *pdev) if (pin_base) { for (i = 0; i < pinctrl_info->num_pins; i++) { serdes_pinctrl->pdesc[i].number = pinctrl_info->pins[i].number + pin_base; - serdes_pinctrl->pdesc[i].name = kasprintf(GFP_KERNEL, "%s-gpio%d", + serdes_pinctrl->pdesc[i].name = devm_kasprintf(dev, GFP_KERNEL, "%s-gpio%d", pinctrl_info->pins[i].name, serdes_pinctrl->pdesc[i].number); SERDES_DBG_MFD("%s:pdesc number=%d, name=%s\n", __func__, @@ -336,7 +336,7 @@ static int serdes_pinctrl_probe(struct platform_device *pdev) } if (!serdes->route_enable) - ret = pinctrl_enable(serdes_pinctrl->pctl); + pinctrl_enable(serdes_pinctrl->pctl); ret = serdes_pinctrl_gpio_init(serdes);