From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755114AbbB0IWp (ORCPT ); Fri, 27 Feb 2015 03:22:45 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:44138 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754933AbbB0IVB (ORCPT ); Fri, 27 Feb 2015 03:21:01 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-5e-54f02856fd62 From: Krzysztof Kozlowski To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Len Brown , Jiri Kosina , David Herrmann , Cezary Jackiewicz , Darren Hart , Support Opensource , Milo Kim , Julian Andres Klode , Marc Dietrich , Greg Kroah-Hartman , linux-acpi@vger.kernel.org, linux-input@vger.kernel.org, platform-driver-x86@vger.kernel.org, patches@opensource.wolfsonmicro.com, ac100@lists.launchpad.net, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org, Linus Walleij , Samuel Ortiz , Lee Jones , linux-arm-kernel@lists.infradead.org, Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: Thomas Gleixner , Pavel Machek , Kyungmin Park , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH v5 18/20] power_supply: bq2415x_charger: Decrement the power supply's device reference counter Date: Fri, 27 Feb 2015 09:19:59 +0100 Message-id: <1425025201-15926-19-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1425025201-15926-1-git-send-email-k.kozlowski@samsung.com> References: <1425025201-15926-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAyWRfSzUcRzH+97v4X53c9vPeehHK+s2ZirctPqk1mizfv5pMWutLbm4YTh2 h1F/ZExxnh2KEJ2chzjOP56LEA5dbrNpaMe1eeY8pCmVh/9e789e773/+FCYsBd3pCJl8VK5 TBItIvm4/u9n46V7rptBnov7BOSOb3KgZjgLh9SDZRwKzRsYdI/tc0FttAdltScU1KswSFNr STA0X4WS1tNQa3lDQle5GoeVRTGMp65y4fvuIIIO0xoJRX80HND05iHQLUwRML31kwBjZzkJ 2zkDCDJ3ykhoGpjlQuaXagSa/WYcJj9WHTbW/pEwOzpIQmP3IgZj+kkCylZtQJ9FgL4rHnrS v2LQpivG4FfLAuHjwtZtebBzvZ9wNq95m2A7yma57KYlmP2Rr+KybXVurHlZQ7C6hkySnZnq Jtn1iQkuWzkSwH6oeH8o1DxjB7NncHap4Dd51+EB/0aYNDoyUSr3uBnCj+jUp3HjGh2T3lqq 8BSks1MiHsXQl5m9LT06YXvGMKcllYhPCel3iHmdvoqfhFwOU7mSgh9ZJO3FtGlqji1beojH 9DXlcI4CRk8iZsE8wj2ybOg45pthnjhinHZmeg+KjjcENMu0dLYQJ3vnmJEh1THzDu/rB6XH XSF9m9FW76F8JKhCpxqQnTQhNE7xODxG7K6QxCgSZOHuobExOnTy8512pB7y7kc0hURWAh/r zSAhIUlUJMf0I4bCRLYCZNoIEgrCJMlPpPLYR/KEaKmiH3EonmMKKvZWedzZM+YJlnxLN2qs hud4fuLIdksJ06riBywrQ3XZ19J8/aLP9qszvUZ2ZKbAJqv955qeqOBVuqLeoS/nvCGpJ/Ap NfWyPYCZbm1w9a+tvRgSkeGUYU1cmfaP0lwvfDH/6szuQ3Mi//6cy5K6ZdTZyYTV3ZKFUFEd Ju0FEa6IkIjdMLlC8h9vKUSc0QIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use power_supply_put() to decrement the power supply's device reference counter (increased by power_supply_get_by_name() or power_supply_get_by_phandle()). Signed-off-by: Krzysztof Kozlowski Acked-by: Pavel Machek Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Sebastian Reichel --- drivers/power/bq2415x_charger.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c index 413fcaa0f15c..10a81a8f928f 100644 --- a/drivers/power/bq2415x_charger.c +++ b/drivers/power/bq2415x_charger.c @@ -1595,27 +1595,27 @@ static int bq2415x_probe(struct i2c_client *client, ret = of_property_read_u32(np, "ti,current-limit", &bq->init_data.current_limit); if (ret) - goto error_2; + goto error_3; ret = of_property_read_u32(np, "ti,weak-battery-voltage", &bq->init_data.weak_battery_voltage); if (ret) - goto error_2; + goto error_3; ret = of_property_read_u32(np, "ti,battery-regulation-voltage", &bq->init_data.battery_regulation_voltage); if (ret) - goto error_2; + goto error_3; ret = of_property_read_u32(np, "ti,charge-current", &bq->init_data.charge_current); if (ret) - goto error_2; + goto error_3; ret = of_property_read_u32(np, "ti,termination-current", &bq->init_data.termination_current); if (ret) - goto error_2; + goto error_3; ret = of_property_read_u32(np, "ti,resistor-sense", &bq->init_data.resistor_sense); if (ret) - goto error_2; + goto error_3; } else { memcpy(&bq->init_data, pdata, sizeof(bq->init_data)); } @@ -1625,19 +1625,19 @@ static int bq2415x_probe(struct i2c_client *client, ret = bq2415x_power_supply_init(bq); if (ret) { dev_err(bq->dev, "failed to register power supply: %d\n", ret); - goto error_2; + goto error_3; } ret = bq2415x_sysfs_init(bq); if (ret) { dev_err(bq->dev, "failed to create sysfs entries: %d\n", ret); - goto error_3; + goto error_4; } ret = bq2415x_set_defaults(bq); if (ret) { dev_err(bq->dev, "failed to set default values: %d\n", ret); - goto error_4; + goto error_5; } if (bq->notify_psy) { @@ -1645,7 +1645,7 @@ static int bq2415x_probe(struct i2c_client *client, ret = power_supply_reg_notifier(&bq->nb); if (ret) { dev_err(bq->dev, "failed to reg notifier: %d\n", ret); - goto error_5; + goto error_6; } /* Query for initial reported_mode and set it */ @@ -1665,11 +1665,14 @@ static int bq2415x_probe(struct i2c_client *client, dev_info(bq->dev, "driver registered\n"); return 0; +error_6: error_5: -error_4: bq2415x_sysfs_exit(bq); -error_3: +error_4: bq2415x_power_supply_exit(bq); +error_3: + if (bq->notify_psy) + power_supply_put(bq->notify_psy); error_2: kfree(name); error_1: @@ -1686,8 +1689,10 @@ static int bq2415x_remove(struct i2c_client *client) { struct bq2415x_device *bq = i2c_get_clientdata(client); - if (bq->notify_psy) + if (bq->notify_psy) { power_supply_unreg_notifier(&bq->nb); + power_supply_put(bq->notify_psy); + } bq2415x_sysfs_exit(bq); bq2415x_power_supply_exit(bq); -- 1.9.1