From patchwork Sun Oct 31 16:24:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 12595301 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49AEBC4332F for ; Sun, 31 Oct 2021 16:25:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3401960EE3 for ; Sun, 31 Oct 2021 16:25:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbhJaQ1q (ORCPT ); Sun, 31 Oct 2021 12:27:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42848 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230320AbhJaQ12 (ORCPT ); Sun, 31 Oct 2021 12:27:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635697495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fPOEwjI1K1hO+z9xpZRtE63xzqb/sG/Qd2WRtIRCf0M=; b=HOp/vxAohmSwK5gTgcSAhsxh3K+ixCeodwfsDzzn/x3kVIkBKH62dRuMRoNattun3drsjF Z+eXjoARmNwR6WOWZmYWJtwyDMUJYMAHMky7RTUz/95M1w8nhSx4m83ftrM3xxrlj+Cbhd THLmRtcIOJOf8tIIGGJR6vBjxE+uIsc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-577-m8dTSM8mMaaylGzLBFFztA-1; Sun, 31 Oct 2021 12:24:50 -0400 X-MC-Unique: m8dTSM8mMaaylGzLBFFztA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDB4A362F9; Sun, 31 Oct 2021 16:24:47 +0000 (UTC) Received: from x1.localdomain.com (unknown [10.39.192.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BE3F100763D; Sun, 31 Oct 2021 16:24:44 +0000 (UTC) From: Hans de Goede To: "Rafael J . Wysocki" , Mika Westerberg , Mark Gross , Andy Shevchenko , Wolfram Sang , Sebastian Reichel , MyungJoo Ham , Chanwoo Choi , Ard Biesheuvel Cc: Hans de Goede , Len Brown , linux-acpi@vger.kernel.org, Yauhen Kharuzhy , Tsuchiya Yuto , platform-driver-x86@vger.kernel.org, linux-i2c@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org Subject: [RFC 4/5] power: supply: bq27xxx: Add dev helper variable to bq27xxx_battery_i2c_probe() Date: Sun, 31 Oct 2021 17:24:27 +0100 Message-Id: <20211031162428.22368-5-hdegoede@redhat.com> In-Reply-To: <20211031162428.22368-1-hdegoede@redhat.com> References: <20211031162428.22368-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add a dev local variable to the bq27xxx_battery_i2c_probe(), to replace "&client->dev" in various places. Note the resulting cleanup is somewhat minimal, this is mostly a preparation for adding ACPI enumeration support which will use the new "dev" variable more. Signed-off-by: Hans de Goede --- drivers/power/supply/bq27xxx_battery_i2c.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c index cf38cbfe13e9..0a1b922389e1 100644 --- a/drivers/power/supply/bq27xxx_battery_i2c.c +++ b/drivers/power/supply/bq27xxx_battery_i2c.c @@ -139,6 +139,7 @@ static int bq27xxx_battery_i2c_bulk_write(struct bq27xxx_device_info *di, static int bq27xxx_battery_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { + struct device *dev = &client->dev; struct bq27xxx_device_info *di; int ret; char *name; @@ -151,16 +152,16 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client, if (num < 0) return num; - name = devm_kasprintf(&client->dev, GFP_KERNEL, "%s-%d", id->name, num); + name = devm_kasprintf(dev, GFP_KERNEL, "%s-%d", id->name, num); if (!name) goto err_mem; - di = devm_kzalloc(&client->dev, sizeof(*di), GFP_KERNEL); + di = devm_kzalloc(dev, sizeof(*di), GFP_KERNEL); if (!di) goto err_mem; di->id = num; - di->dev = &client->dev; + di->dev = dev; di->chip = id->driver_data; di->name = name; @@ -179,13 +180,12 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, di); if (client->irq) { - ret = devm_request_threaded_irq(&client->dev, client->irq, + ret = devm_request_threaded_irq(dev, client->irq, NULL, bq27xxx_battery_irq_handler_thread, IRQF_ONESHOT, di->name, di); if (ret) { - dev_err(&client->dev, - "Unable to register IRQ %d error %d\n", + dev_err(dev, "Unable to register IRQ %d error %d\n", client->irq, ret); bq27xxx_battery_teardown(di); goto err_failed;