From patchwork Thu Jan 12 14:02:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 42454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3897836wrt; Thu, 12 Jan 2023 06:05:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXvVYPolciVtinASzljc8lCljBYQlOAP1VIbo/Hwdftb6Shk366lZxoRd0oZwdLrP4mOP2NU X-Received: by 2002:a05:6a20:3d26:b0:a4:69a2:6dd7 with SMTP id y38-20020a056a203d2600b000a469a26dd7mr100865028pzi.0.1673532356063; Thu, 12 Jan 2023 06:05:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673532356; cv=none; d=google.com; s=arc-20160816; b=U6S8nVTYZ89oXYUHrifwxcGjheTXJAm7NnMrjeumDYc+mTct6MII2f0aksrsKKC6h1 moxtVkNxQQ4qtWRkxp692UoWLacTInUHSUoDineZhLu8lQDEzbffkMY0WZ6FpOrriJOA gj+t+gXbOdeWwUBS5rTaDfGb6mTWEMtyXJ71BOQqtOZe6Fb46bSY8Lc1xzyTQ6kkWlVh pFe9Z/qKa/CLx0k86j2mOKmGLMLyAG9UYu4zF0A7LX/aztWsehkE/DUJET3XTm4P2vNO qCoJXd+1rGlpPuDZNNmuq+qCH7dhPx0ExUGZAbD6tBmTjcL+HIQg91Ok/Y/3ybLaMH4L L06g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=284o8qLdXAJW3y087x71gsC2vCOUf6cAp1ilwWup0ig=; b=wXzx9ePWNkRk7qbKg+5ikdwD7j8Jd7vjbkfI86k082CXtJS3wJqJstH0aKXTuiMUS0 dgsrBTBORT/es1WtGujFHGlpYyiHelf7MiyPqSRMEpQAiVcntGRj/nap7vvQHk7WLn0l AUuCk5nn5S/m/lNk3yJJ8AopcyYoP52pv73VpUEoRSz0kQ2VW3P9alSzhHdRvtiurjrm ++8KzhyquJTsF4Tz6tjtfxyH1PIeeHxdsaCm9h8lHPosjtbb4mPzh0awxzrCtElDrXjR qoYpMVnmVciNY00JKQH4J/txgpT1FHlv8em7ESp06L6jIr2Et+ORHl3kq9ybLqFnqdy9 ll5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=E6t2XIf+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u35-20020a634723000000b0048219b9d027si17499090pga.269.2023.01.12.06.05.39; Thu, 12 Jan 2023 06:05:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=E6t2XIf+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232317AbjALOCP (ORCPT + 99 others); Thu, 12 Jan 2023 09:02:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232258AbjALOCF (ORCPT ); Thu, 12 Jan 2023 09:02:05 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D279517E3; Thu, 12 Jan 2023 06:02:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673532124; x=1705068124; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nmBkWzTGPQmO2j44FytSg1Prn+t+R62VDjJB8NnPYeU=; b=E6t2XIf+TwYKKgPwQCm07YQb5rK8BmEeMJMk5Po1+WY9x02zZYyQasjE +rcGaTQxn4BPbtryWfaGJTKIM51qPfh0vRS6MvSJnpeR9wIBkSkFfBxyZ Vdi4+EdrKY1FoiTjmujR4JnPDMV5Wi3XJgCbRIM4kwDkXgsSmn0G03TCa db4qlsfzQWgQ3oGg9CfiNgjsfIuSDmsMBbpGs3J6+6uvfj/hYijL19mz6 TAY19joK0WLj6P2CyPnbQ9I9CEh9r3ehSb2sdPtPJRYc1T34uXUUglvvE +5S5n06+TssboSHt5BOgamLf8+xlCm5qAUJia/dYjxWKwt1zu9t6oexTK g==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="325732431" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="325732431" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 06:01:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="800215229" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="800215229" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 12 Jan 2023 06:01:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 856EBE1; Thu, 12 Jan 2023 16:02:14 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sebastian Reichel , Linus Walleij Subject: [PATCH v1 1/1] power: supply: collie_battery: Convert to GPIO descriptors (part 2) Date: Thu, 12 Jan 2023 16:02:09 +0200 Message-Id: <20230112140209.61228-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754825863491006570?= X-GMAIL-MSGID: =?utf-8?q?1754825863491006570?= Finish the job started by the commit ba940ed83218 ("power: supply: collie_battery: Convert to GPIO descriptors"), i.e. convert the use of gpio_to_irq() to gpiod_to_irq(). No functional changes intended. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/power/supply/collie_battery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/collie_battery.c b/drivers/power/supply/collie_battery.c index 7fb9b549f2de..68390bd1004f 100644 --- a/drivers/power/supply/collie_battery.c +++ b/drivers/power/supply/collie_battery.c @@ -404,7 +404,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev) goto err_psy_reg_bu; } - ret = request_irq(gpio_to_irq(COLLIE_GPIO_CO), + ret = request_irq(gpiod_to_irq(collie_bat_main.gpio_full), collie_bat_gpio_isr, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "main full", &collie_bat_main); @@ -440,7 +440,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev) static void collie_bat_remove(struct ucb1x00_dev *dev) { - free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main); + free_irq(gpiod_to_irq(collie_bat_main.gpio_full), &collie_bat_main); power_supply_unregister(collie_bat_bu.psy); power_supply_unregister(collie_bat_main.psy);