浏览代码

leds: leds-88pm860x: drop devm_kfree of devm_kzalloc'd data

The devm_kfree function allocates memory that is released
when a driver detaches. Thus, there is no reason to explicitly
call devm_kfree in probe or remove functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Jingoo Han 12 年之前
父节点
当前提交
3651c4b904
共有 1 个文件被更改,包括 2 次插入7 次删除
  1. 2 7
      drivers/leds/leds-88pm860x.c

+ 2 - 7
drivers/leds/leds-88pm860x.c

@@ -165,15 +165,13 @@ static int pm860x_led_probe(struct platform_device *pdev)
 	res = platform_get_resource_byname(pdev, IORESOURCE_REG, "control");
 	res = platform_get_resource_byname(pdev, IORESOURCE_REG, "control");
 	if (!res) {
 	if (!res) {
 		dev_err(&pdev->dev, "No REG resource for control\n");
 		dev_err(&pdev->dev, "No REG resource for control\n");
-		ret = -ENXIO;
-		goto out;
+		return -ENXIO;
 	}
 	}
 	data->reg_control = res->start;
 	data->reg_control = res->start;
 	res = platform_get_resource_byname(pdev, IORESOURCE_REG, "blink");
 	res = platform_get_resource_byname(pdev, IORESOURCE_REG, "blink");
 	if (!res) {
 	if (!res) {
 		dev_err(&pdev->dev, "No REG resource for blink\n");
 		dev_err(&pdev->dev, "No REG resource for blink\n");
-		ret = -ENXIO;
-		goto out;
+		return -ENXIO;
 	}
 	}
 	data->reg_blink = res->start;
 	data->reg_blink = res->start;
 	memset(data->name, 0, MFD_NAME_SIZE);
 	memset(data->name, 0, MFD_NAME_SIZE);
@@ -224,9 +222,6 @@ static int pm860x_led_probe(struct platform_device *pdev)
 	}
 	}
 	pm860x_led_set(&data->cdev, 0);
 	pm860x_led_set(&data->cdev, 0);
 	return 0;
 	return 0;
-out:
-	devm_kfree(&pdev->dev, data);
-	return ret;
 }
 }
 
 
 static int pm860x_led_remove(struct platform_device *pdev)
 static int pm860x_led_remove(struct platform_device *pdev)