From patchwork Thu Nov 9 18:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 163546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp625686vqs; Thu, 9 Nov 2023 10:29:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZbn1zEzfqByma+nW7voqO6DqHq3WzEyRpNuRj342VQZ1zS8OspksBgU10N6A6k1Dbsi0C X-Received: by 2002:a17:903:1cc:b0:1bb:6875:5a73 with SMTP id e12-20020a17090301cc00b001bb68755a73mr6245428plh.2.1699554586413; Thu, 09 Nov 2023 10:29:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699554586; cv=none; d=google.com; s=arc-20160816; b=JqE5AwgOZWZkuSQqKYc/RfpdqWvilsb43VqcG6YPGDxKEBrBW+zCG6TClpFMevdEYH Qo0ynvEHGOwArERYIzXt8aQffpzkCLN0oM3P67/tmgeO0/D+xv0TJu0XOPOlHLrafp5e Y19TKcuCn7aJa8JoSa+uJNS55Vq4oHKfXk3NPk/Lw4nnBl2AIyqxlrlOJxSUpK/6IQCE 3D+z+KBwqqdz32JVsRB85dUlES/1YbUQFCoD0PAhiwHR0Pj3nIQSzgI/EdOjT75qz/ui 1z5ONOiW3dZl4DPoK7XtlTtPm7uxcgeOJZuWHIYTQZ8tRQZWoZAITE5rCDTm9GG2SyBF tpag== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cEwnbO4q9lY80a9VzP807DCeLjela0KounsJGN7e6Zg=; fh=mq6/FMGJdqTI0UuZRoAMccy9L/KbJAT6TPJFW+BrH4Y=; b=Yr8O68RWkTIdji3yqG16ThEss7UgIIDK1zED73P9WISL+XGs40grN0yxrkXbH8xkPx wuZWtewqUg4X7im2+J6UPB+N6UUbp9Sduw+vVziRayrhhri/rW6nu/9NhPVFrPrMAGXO SC3W1PJJ7RCfmgqW+AVB5zRsBbovPg5r9JuneBzQIoEKB6+GuTkR+Lh7jco3HVfERQsW bsMXrnZipNSfWDtfkOfd4Zo8Jz8ICuLUrGscSRi680pWtKn0Emh06S1V5yWUrhudc/O3 efQffEz/bXoqJa74GkOaytC/j2q58FeYuDt0wflMxXYUppCklS3QHqR8LLXWdIuTmYuk GeIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JRTsvz5m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id p12-20020a170902eacc00b001cc43368c9bsi5054924pld.630.2023.11.09.10.29.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 10:29:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JRTsvz5m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C519A83C38E4; Thu, 9 Nov 2023 10:29:24 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345046AbjKIS2s (ORCPT + 31 others); Thu, 9 Nov 2023 13:28:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345014AbjKIS2m (ORCPT ); Thu, 9 Nov 2023 13:28:42 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ED3A3C05; Thu, 9 Nov 2023 10:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699554520; x=1731090520; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7CmFR+naMyItEiHSLEGMk+csTHhFMkqMImr3uUC48S8=; b=JRTsvz5mTphTz4QiyFz3xkRpAC7SZoSWTjvZV5FG6l7CVQqIB6aoP/cM LhFtiZYjKBY0uJzYqWaaOSv8nAcAhON04uy++FsFWUsZzu4ZUm2dUb6H3 /49qhfJXeOz1KEQ0KjOLvPZqUVAacxIMgmLnEIBBCri0qgTaemkso4uBp 4I7IHkWppEYmIl8P7SDfZDArcsryb0zjMbQFMFN57QzVkO21UepK+2oo/ GgWKU6xeBvYh0cHAqCca/S3mi7x4fELGWPgTVUsh6OkpK5dFPh0+WRO4E hXwxvqDf4DiBZVy/1iKWiC2wriB2LV1oqaRdU26kGKp44h4TYmVldo9YW g==; X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="375088690" X-IronPort-AV: E=Sophos;i="6.03,290,1694761200"; d="scan'208";a="375088690" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2023 10:28:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="767086845" X-IronPort-AV: E=Sophos;i="6.03,290,1694761200"; d="scan'208";a="767086845" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 09 Nov 2023 10:28:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8821E76F; Thu, 9 Nov 2023 20:28:32 +0200 (EET) From: Andy Shevchenko To: Jarkko Nikula , Herbert Xu , Mario Limonciello , Andy Shevchenko , Wolfram Sang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Jan Dabros , Andi Shyti , Hans de Goede Subject: [PATCH v2 05/12] i2c: designware: Rename dw_i2c_of_configure() -> i2c_dw_of_configure() Date: Thu, 9 Nov 2023 20:19:15 +0200 Message-ID: <20231109182823.3531846-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1996.gbec44491f096 In-Reply-To: <20231109182823.3531846-1-andriy.shevchenko@linux.intel.com> References: <20231109182823.3531846-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 09 Nov 2023 10:29:24 -0800 (PST) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782112149750954199 X-GMAIL-MSGID: 1782112149750954199 For the sake of consistency, rename dw_i2c_of_configure() and change its parameter to be aligned with the i2c_dw_acpi_configure(). Signed-off-by: Andy Shevchenko Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-designware-platdrv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index af772a2c7fb6..c55fff3df8ca 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -110,9 +110,10 @@ static int mscc_twi_set_sda_hold_time(struct dw_i2c_dev *dev) return 0; } -static void dw_i2c_of_configure(struct platform_device *pdev) +static void i2c_dw_of_configure(struct device *device) { - struct dw_i2c_dev *dev = platform_get_drvdata(pdev); + struct platform_device *pdev = to_platform_device(device); + struct dw_i2c_dev *dev = dev_get_drvdata(device); switch (dev->flags & MODEL_MASK) { case MODEL_MSCC_OCELOT: @@ -130,7 +131,7 @@ static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) return -ENODEV; } -static inline void dw_i2c_of_configure(struct platform_device *pdev) +static inline void i2c_dw_of_configure(struct device *device) { } #endif @@ -279,7 +280,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) i2c_dw_adjust_bus_speed(dev); if (pdev->dev.of_node) - dw_i2c_of_configure(pdev); + i2c_dw_of_configure(&pdev->dev); if (has_acpi_companion(&pdev->dev)) i2c_dw_acpi_configure(&pdev->dev);