From patchwork Sun Dec 31 14:17:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ognjen Galic X-Patchwork-Id: 10138197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 18F09605B4 for ; Sun, 31 Dec 2017 14:18:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0662028553 for ; Sun, 31 Dec 2017 14:18:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED51D287E3; Sun, 31 Dec 2017 14:18:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, TVD_SUBJ_WIPE_DEBT, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98F4B28844 for ; Sun, 31 Dec 2017 14:18:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750854AbdLaOSD (ORCPT ); Sun, 31 Dec 2017 09:18:03 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:41693 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750762AbdLaOSC (ORCPT ); Sun, 31 Dec 2017 09:18:02 -0500 Received: by mail-wm0-f66.google.com with SMTP id g75so55152525wme.0; Sun, 31 Dec 2017 06:18:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=QJYBYqGbY1Cg1xRZhSSFVVOIbVvuZs8OeTKhVaAa1f8=; b=tokJcBfF9Ma8iLd5k8EbUul7SYG5b8waAKbBYFCABi2FrMTf2TXOn2zS2ucS1iPZsh zuwDLaoLO9C0TeioccNVBsgic4Tg8Wk8ZkEuf5R8pSV+zCz8Vm6kHGum2jnpydne4rGd YTRKBap5K0rXepLAst7e2WYGRzaVmvOtfHu14VpcUM8PDD0mx2XfMi2ekglK9ompMkfH 5q1Vlxe1BNaV4vbhisYWCrPXexFjvg/MjpfriSpaXh6v4zF90nZGU+uzF4VpaF8tdTDb /q/v4+MF2up/8H1EDwxyXHQ61M0TeyxnNu7xiOUZfnqCKB9PwTG8HkYTSKn01xuadQUK CG9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=QJYBYqGbY1Cg1xRZhSSFVVOIbVvuZs8OeTKhVaAa1f8=; b=A/isLNSgW4KQAi9j4UyxbanCsGQlYL69pjIWNsjOA7N7PDHCEnUtNvZihBrWxXBo2p h3T9jKHPzMzCgLBMLRyWF8ZiO1hSoOUT68nrWYp9ls8dxfPPLDeUgkjmtN3FhsoFjfya HN/hck+mASIcgfkhlpUO6mJGgZm11lTIhZ/CyJYxg/4xrnAjBjCKf734wM1sgOX8fEyh DjoFm61fwuKI4qktOOqOJqq+y3nLn1oDIBZIcCz4D/3TcHLsaghP2XBywAGUJJx6txuz Q16De2yIV07w3sCCvQ0AOlW+gyk6LzuBZpeNScfC4ORuf8y4SNWMtgOGTrhzaQEVkwjG nnag== X-Gm-Message-State: AKGB3mJrzt7a/Ek5RPezyemIjxSVVBXfb9mwLY8oysgArZKjLPQUFqtT wUJHHYSNkDMWz+0flYb3d6Y= X-Google-Smtp-Source: ACJfBouxc0QPn0jxAdXIRF5nSgZO2ff8ihHM4egWhgmziJb1nbCTV0rTAKz18wQak1ETnzKYThT+eg== X-Received: by 10.80.190.76 with SMTP id b12mr53293372edi.184.1514729881283; Sun, 31 Dec 2017 06:18:01 -0800 (PST) Received: from thinkpad (pppoe-46-239-11-36.teol.net. [46.239.11.36]) by smtp.googlemail.com with ESMTPSA id c25sm35905848edb.52.2017.12.31.06.17.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Dec 2017 06:18:00 -0800 (PST) Date: Sun, 31 Dec 2017 15:17:57 +0100 From: Ognjen Galic To: Andy Shevchenko , "Rafael J. Wysocki" , Ognjen =?utf-8?B?R2FsacSH?= , "Rafael J. Wysocki" , Len Brown , Robert Moore , Lv Zheng , ACPI Devel Maling List , devel@acpica.org, Darren Hart , Andy Shevchenko , Henrique de Moraes Holschuh , Sebastian Reichel , Platform Driver , ibm-acpi-devel@lists.sourceforge.net, Linux PM , Christoph =?iso-8859-1?Q?B=F6hmwalder?= , Kevin Locke Subject: [PATCH v11 5/5] pm: Remove to_power_supply impl in ds278* Message-ID: <20171231141757.GA4674@thinkpad> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes a issue introduced by patch: pm: add to_power_supply macro to the API In that patch a new macro has been defined in the power_supply.h header with the same name as the private function name in the ds278* battery modules that does the same thing, thus clashing and producing build errors. This patch removes that private implementation. Signed-off-by: Ognjen Galic v11: * Fix build error pointed out by the Intel automated kernel build daemon/bot --- drivers/power/supply/ds2780_battery.c | 5 ----- drivers/power/supply/ds2781_battery.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/ds2780_battery.c index e5d81b4..370e910 100644 --- a/drivers/power/supply/ds2780_battery.c +++ b/drivers/power/supply/ds2780_battery.c @@ -56,11 +56,6 @@ to_ds2780_device_info(struct power_supply *psy) return power_supply_get_drvdata(psy); } -static inline struct power_supply *to_power_supply(struct device *dev) -{ - return dev_get_drvdata(dev); -} - static inline int ds2780_battery_io(struct ds2780_device_info *dev_info, char *buf, int addr, size_t count, int io) { diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/ds2781_battery.c index efe83ef..d1b5a19 100644 --- a/drivers/power/supply/ds2781_battery.c +++ b/drivers/power/supply/ds2781_battery.c @@ -54,11 +54,6 @@ to_ds2781_device_info(struct power_supply *psy) return power_supply_get_drvdata(psy); } -static inline struct power_supply *to_power_supply(struct device *dev) -{ - return dev_get_drvdata(dev); -} - static inline int ds2781_battery_io(struct ds2781_device_info *dev_info, char *buf, int addr, size_t count, int io) {