Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754166AbcKUSL5 (ORCPT ); Mon, 21 Nov 2016 13:11:57 -0500 Received: from host.prodys.net ([89.248.106.65]:55323 "EHLO host.prodys.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753565AbcKUSLy (ORCPT ); Mon, 21 Nov 2016 13:11:54 -0500 From: Nicola Saenz Julienne To: sre@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, nicolas.saenz@prodys.net Subject: [PATCH 1/2] power: supply: sbs-battery: use fixed device name Date: Mon, 21 Nov 2016 19:04:50 +0100 Message-Id: <1479751491-8849-2-git-send-email-nicolas.saenz@prodys.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479751491-8849-1-git-send-email-nicolas.saenz@prodys.net> References: <1479751491-8849-1-git-send-email-nicolas.saenz@prodys.net> X-OriginalArrivalTime: 21 Nov 2016 18:03:17.0622 (UTC) FILETIME=[895B0960:01D24421] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1203 Lines: 35 The current device name for sbs-battery is derived from it's i2c address. This is not acceptable if we want to be able to trigger the "external_power_changed()" routine from a charger driver. Signed-off-by: Nicola Saenz Julienne --- drivers/power/supply/sbs-battery.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index 8bb2eb3..9565c696 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -740,6 +740,7 @@ static void sbs_delayed_work(struct work_struct *work) } static const struct power_supply_desc sbs_default_desc = { + .name = "sbs-battery", .type = POWER_SUPPLY_TYPE_BATTERY, .properties = sbs_properties, .num_properties = ARRAY_SIZE(sbs_properties), @@ -762,11 +763,6 @@ static int sbs_probe(struct i2c_client *client, if (!sbs_desc) return -ENOMEM; - sbs_desc->name = devm_kasprintf(&client->dev, GFP_KERNEL, "sbs-%s", - dev_name(&client->dev)); - if (!sbs_desc->name) - return -ENOMEM; - chip = devm_kzalloc(&client->dev, sizeof(struct sbs_info), GFP_KERNEL); if (!chip) return -ENOMEM; -- 2.7.4