Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp1685304rdb; Thu, 7 Dec 2023 06:18:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IG2nA60zwjDrkFanlyUyj7sVDe7sLtRDsUJMUqYrQNQUT9C5kw7j3Zce55sHIs0aCseThQ+ X-Received: by 2002:a17:90a:8c7:b0:286:6cc1:865d with SMTP id 7-20020a17090a08c700b002866cc1865dmr2083459pjn.66.1701958713652; Thu, 07 Dec 2023 06:18:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701958713; cv=none; d=google.com; s=arc-20160816; b=rJvELC9Tb7aLLV/Ngd0KUZIMZuwn6FIcqh9rCdsUDDNNsAvxdP4asjSw6ePDbCbz4+ FEmA1jBzhmlpwEcw9C24jCNUtkBIGKRZRdjHikgdM5pSPKpwap2VyzfFioaVHpSwXciL xllt1q+u7V0AUukn+ZoI5MeNUPCR0spa74S3CmkbWYV43WjQnyKc2M1ecdyR5WxDN4cU MGaPJz/1CrVAVEBNVkxvyhHPx6CHF5CCB4bcOqK7t4LAVIVJK1qS/VHY9O8fsGvcTPjV BBDM7wWZOfI8sr/I68Ahnnj7fCEd/14IKc9OKzYtKuLjkUn2KdRIIVYgP/FHxKMfDLsG RnIA== 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=4O81UU7PknJJqstfcHALVvbC0+kK/5vzvl5W37A4SNo=; fh=2EyuYZuFv7pvbWODgXyYvSVo1Jt/nOD9U4n59BuOM5Q=; b=ACQ7NihUkWMzKpPivIQD3QZCgk0tndIIw1Or6y1hC/IwQgALeVnGnJyqTS9mtJwI1P J/fcia8Zj6dGD22xq/zda4KVG/jhT/DPSxQcZp465lLe2OWMmuJzTjRY0q5KWj3VjbNm qChD+FQ2X0IiZqPFadpLX1LbX/JUXHglQwXrjppuKMLAIdavXFWweUutJrxnTs2wX0tW ja7NiG8Kxl0fOUqXOZlAcs02VVMXPrlfMBSun6hTymJuJFQ2/5oXkUjYL8qpiamhQdPK Cj5rwGVum3+inm7Wks2TDW+V4aO8MyZhsx8hJDSxePIcaJ9ABn5G1qGqfPrNH13pVu/8 hx/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ehvBIwlt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id x23-20020a17090abc9700b00286c80ac075si1197804pjr.177.2023.12.07.06.18.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 06:18:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ehvBIwlt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 59CE3803FC24; Thu, 7 Dec 2023 06:18:24 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443240AbjLGORX (ORCPT + 99 others); Thu, 7 Dec 2023 09:17:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443107AbjLGORG (ORCPT ); Thu, 7 Dec 2023 09:17:06 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0429910EB; Thu, 7 Dec 2023 06:17:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701958632; x=1733494632; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fdf8dgQVzuzQxTt7wdbNS5bskoga27POgf3pr9jQPuY=; b=ehvBIwltQNogxhxBbn63LCdaBqbvbjh13jWpGlgACSw5DugFtCD+3r9F iI4BUDfcxTHKWxL1TCrUrUxY+1HdMCdR9whR0jDyF5kpImh/Mtvr3K+ya 96qLHwqf5s77Zhr4o1uwSJCYm931CQ4UqFehSVn/TnrW1bxQJLpeL7wXS QpvC7wygtBT5CILxI2uyZXdRh5p7alaQkwUUOCbK8nmIip1avugvGHCBP QB/5qUJvQPvaz8Tbisw1JLgh3Ii29IH/vfAPxG/SY7un41O/cwjFTgX/H 43I4KiS199LcINhXtV8rR+7sjIJPBjFQCAYbwSuKq8IgtURRV+obeJcT9 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="460726112" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="460726112" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 06:17:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="889756082" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="889756082" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 07 Dec 2023 06:17:08 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 184C0B84; Thu, 7 Dec 2023 16:17:03 +0200 (EET) From: Andy Shevchenko To: Mario Limonciello , Jarkko Nikula , Herbert Xu , Andy Shevchenko , Wolfram Sang , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Jan Dabros , Philipp Zabel , Serge Semin Subject: [PATCH v5 13/24] i2c: designware: Rename dw_i2c_of_configure() -> i2c_dw_of_configure() Date: Thu, 7 Dec 2023 16:13:53 +0200 Message-ID: <20231207141653.2785124-14-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com> References: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Thu, 07 Dec 2023 06:18:24 -0800 (PST) For the sake of consistency, rename dw_i2c_of_configure() and change its parameter to be aligned with the i2c_dw_acpi_configure(). Reviewed-by: Andi Shyti Reviewed-by: Mario Limonciello Acked-by: Jarkko Nikula Tested-by: Serge Semin Link: https://lore.kernel.org/r/20231120144641.1660574-14-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko --- 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 7449f1b37ecf..b8606b651feb 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 @@ -306,7 +307,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); -- 2.43.0.rc1.1.gbec44491f096