From patchwork Thu Nov 9 18:19:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 163541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp625531vqs; Thu, 9 Nov 2023 10:29:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKgYLoz4QapDr82EbLhPjdAxnQd9RovsUZQaVMj1LltzeGp/C1e5bgr8QSeIDXVJlzk6QV X-Received: by 2002:a05:6871:5225:b0:1e9:f4e4:2882 with SMTP id ht37-20020a056871522500b001e9f4e42882mr6580928oac.38.1699554567674; Thu, 09 Nov 2023 10:29:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699554567; cv=none; d=google.com; s=arc-20160816; b=t13ZpVyNehoKV/zxvxDQd4bIVpmLfS48JLdBUoeD9yPNSSXbOGBkBpHqMz+18gj4DO v6iWsf9c56B3BVt56PyaVaBcg533MV/999UpgCYnRuDVrDmRzAZ/9swwlupiEkBUbLcX TlwJ/OJdcjhUHXrsudpXh0g7SlhtfQI0D1BOYcLcnr9Q7UlgIC3Ao+nqfjc9q8lP7Xg3 j+9rOAxVNyyziUe9GpxhB33gWwVsbYyu+o4ey7HHPozT/beAY16Zd03wxfr32l7XegcJ +HkpE8OGeb3oeUE7KLwNEA/tiwcFRTL6itp9sD2p1hhzM+Or4rjAc+8igK3iXCFsJWIF OkvQ== 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=SOZqZF3HZp/UuF7jH6tU2cbgMmcfovYNJMBj/6NA9vg=; fh=mq6/FMGJdqTI0UuZRoAMccy9L/KbJAT6TPJFW+BrH4Y=; b=m85TMt3tSAnIreNlxworxCuFVciZvAKF3P3vehABdDmX5kKUWyfVpelCkFVLfsxR5v SprfVJNpvFEKV5l5sisGnPYZ00l7Tp64Wxhl2qIIoIHYvEPXkiYhy4cD1mlGx0L6yHvS OYoj5ICN/qgBwH4qK8rHxJesxAaz76XnG2C1pjedFOFlyks8icooUdL7qTyAWBmCQjIT 2KJa2P6jIoKVJM5JPXiU95Q8ta87doIMR6nwLMd+7+j8YeSRg85ajJwyP1b8AR9Umw4i irPh1RWNx5gbTlLlBmUgzri9fu1ePMQXMYMRdnQCG/5qwP2w2/89G92a3nS9Q4sRcri4 YEVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="jR8e/s9o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id r16-20020a6560d0000000b0057828b85afdsi7332556pgv.795.2023.11.09.10.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 10:29:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="jR8e/s9o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id B24A181C77A4; Thu, 9 Nov 2023 10:29:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345054AbjKIS2u (ORCPT + 31 others); Thu, 9 Nov 2023 13:28:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345015AbjKIS2m (ORCPT ); Thu, 9 Nov 2023 13:28:42 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A99993C06; 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=yDPVqcRH6sP/SphP24kcue0BYm7loFUON/tJY9ZWFSk=; b=jR8e/s9osj+sDSKswsajw9gLFMkQOt/sWTaLOyw29SDujBMDuSJwKgfm Pdv7meNl3yVf9IV0sYjviZwUli4FtUZ4A9IVfp3MT8C0sMhcuFZJXwYb9 WDRabSEYAkYh7r3bwOUF1PT7eF6WwyuFK2DF56+CdcAzCDHSB/KTntB/n w1kiUPYGvSNNqAZs7O85BdFyVt+zFaoAbDlTRP7AazPqTJ5TCg5YVLsPE nSUbs+d3GoY1A1vn/KSpaVYYOiTYash4GkAV0X7u3JAuW14wXu5HQQw93 hVux8ZttLB+L51g5i4xsaT6B/A/VWzXZ/YygDRcgNZqxcXZYbiqeJkBBV w==; X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="389853919" X-IronPort-AV: E=Sophos;i="6.03,290,1694761200"; d="scan'208";a="389853919" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2023 10:28:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="936938985" X-IronPort-AV: E=Sophos;i="6.03,290,1694761200"; d="scan'208";a="936938985" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 09 Nov 2023 10:28:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id AD46B7F1; 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 07/12] i2c: desingware: Unify the firmware type checks Date: Thu, 9 Nov 2023 20:19:17 +0200 Message-ID: <20231109182823.3531846-8-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 (lipwig.vger.email [0.0.0.0]); Thu, 09 Nov 2023 10:29:15 -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 lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782112129940487745 X-GMAIL-MSGID: 1782112129940487745 Instead of asymmetrical checks for the firmware type use the is_*_node() calls. Reviewed-by: Andi Shyti Reviewed-by: Mario Limonciello Signed-off-by: Andy Shevchenko --- drivers/i2c/busses/i2c-designware-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c index a5cae814a9c2..49d9d5f83071 100644 --- a/drivers/i2c/busses/i2c-designware-common.c +++ b/drivers/i2c/busses/i2c-designware-common.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -372,14 +373,15 @@ int i2c_dw_fw_parse_and_configure(struct dw_i2c_dev *dev) { struct i2c_timings *t = &dev->timings; struct device *device = dev->dev; + struct fwnode_handle *fwnode = dev_fwnode(device); i2c_parse_fw_timings(device, t, false); i2c_dw_adjust_bus_speed(dev); - if (device->of_node) + if (is_of_node(fwnode)) i2c_dw_of_configure(device); - if (has_acpi_companion(device)) + else if (is_acpi_node(fwnode)) i2c_dw_acpi_configure(device); return i2c_dw_validate_speed(dev);