From patchwork Fri Nov 10 18:11:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 163965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1346907vqs; Fri, 10 Nov 2023 11:51:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IFamiMGKjr+QJEmn7GAkAY3ybMP57Od0r1Wsl+Z+5d6XUS+6IFj8KB9/+d9dKRkn4hf+NWF X-Received: by 2002:a05:6a00:2310:b0:6be:4789:97ba with SMTP id h16-20020a056a00231000b006be478997bamr19004pfh.3.1699645884500; Fri, 10 Nov 2023 11:51:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699645884; cv=none; d=google.com; s=arc-20160816; b=aT+6O0nIvqJMsVXz0a6JC6pJoBhvILScbeHZVNKZOo6kI1U/EJGQYkFXhJkfFgpOOu X6busRepgnpawswYjkmABvJc+7+JRXEIu3uKyQHO8Q7nbRWCnHRFGiY4kpTc0WUyZReo OvvlPlWGmpDhC2jfzer6KHVu+af9bl8hz8riCIMbgZMO3fY19id1XbHE5W1ZB+s8yti2 3CMLbISJnx+IGIbnD8g/b6BXn2SSNAzNVijq/l5NZtbsNykcfpnEma+unDuobxa10yFx Bbsxq+vcU4+f0skL3QwCg7A1wueq5zRBQM/rxImUZ7Ii4T28uVLG6GY4YIvU9zTrtCTu tDbA== 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=CMYTXXNmMALgTdI8TJn+qTi96rSszhFRjgKUdlF1Vig=; fh=oqZDtrV02dtzkTHSBiwo+TWR13WhTCI6t34Q5J0VV5o=; b=gz0DYZ1vrtQq016DU6gOtcUzzSCWGF+4YYUY3OgJ1zTj5h29PYsLRqGFoV71EOQa/V H5lYd/0uazTIgL7H0t7Jsbu6I15GW4VJPLq4BexIqkIbcQQhR9PsVK+9VP50yg5t3Ufq AwCCQyG6gUtP5azTscmWoBpoqV8mLHCNBRDWnXQJXqVTH2+hRngpi3S3FkJML82pG7yF lG7Q45hoSnU5V3AcdZLtQFcS+0KfWhZcRBRawvIWKAQr1zk4KO67+WO/d9rNJjz2kwB9 sFrxl7sdCKGLFBAUSY6t27riCZNNCvMyuOQPNq0shFejjyoTvnoCxZg+aOMYDKzNG+57 503g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HoLZ3TZG; 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 g8-20020a63fa48000000b005652bd27e80si86446pgk.588.2023.11.10.11.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 11:51:24 -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=HoLZ3TZG; 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 A8107809862E; Fri, 10 Nov 2023 11:49:56 -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 S1346465AbjKJTt3 (ORCPT + 29 others); Fri, 10 Nov 2023 14:49:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236304AbjKJTtR (ORCPT ); Fri, 10 Nov 2023 14:49:17 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B0C3129207; Fri, 10 Nov 2023 10:31:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699641065; x=1731177065; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rMCJyp3s0CVWHHyikBnsf5d5zvaMttv+rzq/RNKsO7w=; b=HoLZ3TZGh3JEzWijA0dxenmQhVTfmmtC/32fRYBsJ/DCyNJeCsvT1IXR CgFQcQ43wkqgbLADvJoNgVpTnHINNmiuxTxzQbRMQJvRWhKUI8x5CMKul obelbVd9//o2q59dCWYDF3x7hb0QlUqVye4L8FbhICGCaEaBqtT7mMbeo oNjSOO9Jf/PqkX8QMlyl3jix6S2mWm4lSvJ2RSYzswS/LAEL91xfKdGnE WWqAAlWV3LFU7m5BrBQ7Nryr0DPrESZGaj7bT5UTuSAr5vcLsZus/SLFZ uoNLhW/ilGWXh87m/FEFYc/tBMh9v4v092pLomStzZW3+u0wTpt8wiBEr A==; X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="380606862" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="380606862" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 10:29:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="792912168" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="792912168" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 10 Nov 2023 10:29:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 1318A8C1; Fri, 10 Nov 2023 20:23:08 +0200 (EET) From: Andy Shevchenko To: Jarkko Nikula , Mario Limonciello , Herbert Xu , Andy Shevchenko , Wolfram Sang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Jan Dabros , Andi Shyti , Philipp Zabel , Hans de Goede Subject: [PATCH v3 16/25] i2c: designware: Unify the firmware type checks Date: Fri, 10 Nov 2023 20:11:36 +0200 Message-ID: <20231110182304.3894319-17-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231110182304.3894319-1-andriy.shevchenko@linux.intel.com> References: <20231110182304.3894319-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 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 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]); Fri, 10 Nov 2023 11:49:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782207883355461931 X-GMAIL-MSGID: 1782207883355461931 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);