From patchwork Fri Jun 9 15:25:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 105704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1024650vqr; Fri, 9 Jun 2023 08:29:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4HYr1PLniszcvuevPd11qJ+ayKMitkAy5Ky2l+VmvcKEGLPzNyvti6oTH96UQDmaDyvmV0 X-Received: by 2002:a05:6a21:6713:b0:101:1951:d491 with SMTP id wh19-20020a056a21671300b001011951d491mr1051960pzb.6.1686324546410; Fri, 09 Jun 2023 08:29:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686324546; cv=none; d=google.com; s=arc-20160816; b=zRHgW24h46Sz7+tvZV6k0Drt3QiNKvXeO1IJc0bhQlHGEYSrYW3WoKMNEprTujgfCH GL6AREWP1sDTcouqXWPXoxDhGf30cQ07jTThtfPTdDZMTcHQRy2a7GXbAZ3vlM/kn2fV GhjSs4RcgGzwkKl6HPIeUDbzdLN8v8wBm1P2knVHlb5vuJsMp4nQwPiqeFgUvhhreGTh +IeexT44UW/i2g+YG6TYOKz3yDgxLXm1w3i4MZOc3y7skKKQ5N4TC1BYkdiTDerq6U+v btsFjKqAFgDyczeyk44KGBkGtGwPJIWEzQ3Ipuyhgh7O6oIfszOBFIRZwWPvQBuJ/jy1 4krw== 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=KkmqvFBeBNvH9sCmyai0twWAjSCkSQ+X/8/N8XE+gbw=; b=V8SYzuJzrieYaGMe69Oy8uYy74kDQEHnvQvJ89wSyfVV8RBhT8CDS1TSgNZ6m0Gw/l PsU+cnq/U97A8Qen14QZ7fNyCQ3CWzkSeBvjJMm3DSGzssfnxB1ho2ujov6+HDsFwvUD Yo7CL+QAkbWhFJOAQjzANVzf8BNx5mp9RH4u3vkEvoRXeCbO7YlZTwYI+z0IkBr8XbGq xqkxPv8DaKuYosjJD/QFBUi2gibWhKIznIRdcsEitYwpmBr/DYn6SKdf/qiF2F1S9DPZ /OpdIX5uMG6qVuxT7VPh9Bvs0Z4QtKeSG4SXb7ta8VXKBPPGDGful2kKX+egGYxcf+Mn zyKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T7elnzfw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b8-20020aa78ec8000000b0064d59fded0bsi2657059pfr.101.2023.06.09.08.28.51; Fri, 09 Jun 2023 08:29:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T7elnzfw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241728AbjFIPZa (ORCPT + 99 others); Fri, 9 Jun 2023 11:25:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241534AbjFIPZO (ORCPT ); Fri, 9 Jun 2023 11:25:14 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4E3335B6; Fri, 9 Jun 2023 08:25:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686324312; x=1717860312; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ddxTpj08Ejw4GJ1aZ/q3t7SQimsuCWBX6xQNszlNeHQ=; b=T7elnzfw5GNCpdj814oiTP4sXUn15CIhuOZrvPuXj2CXEQilvra4glah 0aIm6LjToxvgY2hYOHBpeo7+L/c9v7IWZEkm1sTZEWg3Qy4GubakXi0Mv ooibK2NV3Tbr9ZcF1//M5l69iYP2Dx5J4Qdx6l3sBRrrDiMZoAyfXGo+B OkxBnPlgA5ZVtK3ucVCms5YrPhkJD4wLmbQwLwpW5bolPxGIyPaTEvPSx E9RD8nl0t5sYTNq9RkhvhTV93TeG9Bj1uLpZaDIzJAgqaUxv7/ZsJOpbD d57nNgA6tgGxq/cyV/B/2geZsL10h9U7SJQhOW4ShluqsLEgARW8QROdZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="357623180" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="357623180" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2023 08:25:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="775532601" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="775532601" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 09 Jun 2023 08:25:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 681CD16A; Fri, 9 Jun 2023 18:25:14 +0300 (EEST) From: Andy Shevchenko To: Serge Semin , Damien Le Moal , Andy Shevchenko , Greg Kroah-Hartman , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Hans de Goede , Jens Axboe , "Rafael J. Wysocki" , Len Brown , Daniel Scally , Heikki Krogerus , Sakari Ailus Subject: [PATCH v1 1/3] ACPI: Move ACPI_DEVICE_CLASS() to mod_devicetable.h Date: Fri, 9 Jun 2023 18:25:05 +0300 Message-Id: <20230609152507.77649-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230609152507.77649-1-andriy.shevchenko@linux.intel.com> References: <20230609152507.77649-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768239447264592143?= X-GMAIL-MSGID: =?utf-8?q?1768239447264592143?= The data type of struct acpi_device_id is defined in the mod_devicetable.h. It's suboptimal to require user with the almost agnostic code to include acpi.h solely for the macro that affects the data type defined elsewhere. Taking into account the above and for the sake of consistency move ACPI_DEVICE_CLASS() to mod_devicetable.h. Note, that with CONFIG_ACPI=n the ID table will be filed with data but it does not really matter because either it won't be used, or won't be compiled in some cases (when guarded by respective ifdeffery). Signed-off-by: Andy Shevchenko --- include/linux/acpi.h | 14 -------------- include/linux/mod_devicetable.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d41a05d68166..640f1c07c894 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -70,19 +70,6 @@ static inline void acpi_free_fwnode_static(struct fwnode_handle *fwnode) kfree(fwnode); } -/** - * ACPI_DEVICE_CLASS - macro used to describe an ACPI device with - * the PCI-defined class-code information - * - * @_cls : the class, subclass, prog-if triple for this device - * @_msk : the class mask for this device - * - * This macro is used to create a struct acpi_device_id that matches a - * specific PCI class. The .id and .driver_data fields will be left - * initialized with the default value. - */ -#define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (_cls), .cls_msk = (_msk), - static inline bool has_acpi_companion(struct device *dev) { return is_acpi_device_node(dev->fwnode); @@ -782,7 +769,6 @@ const char *acpi_get_subsystem_id(acpi_handle handle); #define ACPI_COMPANION_SET(dev, adev) do { } while (0) #define ACPI_HANDLE(dev) (NULL) #define ACPI_HANDLE_FWNODE(fwnode) (NULL) -#define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (0), .cls_msk = (0), #include diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index ccaaeda792c0..486747518aae 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -221,6 +221,19 @@ struct acpi_device_id { __u32 cls_msk; }; +/** + * ACPI_DEVICE_CLASS - macro used to describe an ACPI device with + * the PCI-defined class-code information + * + * @_cls : the class, subclass, prog-if triple for this device + * @_msk : the class mask for this device + * + * This macro is used to create a struct acpi_device_id that matches a + * specific PCI class. The .id and .driver_data fields will be left + * initialized with the default value. + */ +#define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (_cls), .cls_msk = (_msk), + #define PNP_ID_LEN 8 #define PNP_MAX_DEVICES 8 From patchwork Fri Jun 9 15:25:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 105707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1030432vqr; Fri, 9 Jun 2023 08:38:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ75fG6d9Ryj83dx79CVi2BjWEPylPC6lbu4R2h5XtYC7177+56nKqjpleZb+5JFJZ4OYQ1H X-Received: by 2002:a17:90b:3750:b0:255:a7ed:94a1 with SMTP id ne16-20020a17090b375000b00255a7ed94a1mr1188608pjb.41.1686325112224; Fri, 09 Jun 2023 08:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686325112; cv=none; d=google.com; s=arc-20160816; b=gjVx83K8CeqCA09A0w/XjlvoL/vjI8couCeLNrfGrpqHMN557HFUTjU1bTASH2Or1L Ples2KxQ4z4XzVW57xgeCmLr2jK4ZV4SnadcDeUYyeNlEZTjHrzCPXPqZFrGs6aN2K+N yaS99KrHoktBnLDI860xjxak150IwOF8MEUtj/0QlRLXgB/QIFQU6mKh6IXUufMwmZKS mfbt1oVJV3yODLI2F73A2tg2+gzjJQTqmhc8HuvNoQ7vJoKAwlwJGnQ9U3x9VsTseWnb JxibWWpJ8qudqVN8J27cQ4F79AnTXNS5QJcT1cyidoacJPopSERellFUAbyVhqGhfsXs HIBg== 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=GvKXdmTg0iXM9yiu5aIqHmZfjG6Y4INLBNEr6rQekUY=; b=eH17mv7W0E17mKd4T1fDOVHaNbdtzCxskU3cmcwuaCyIm+WADhB+KcZysSie8AuP6E vwYfelD4qrbNIwudPbQlqBa/nNC/X/Yx8sw4jN108gqdvNLy0pW3Dk89g7vJ1Y3/2b/r lxoXUqAFuYeF4wCSLz55Wf2F4ym1DeKqC8JMNpJKSofUsMm5Vb81HzvEjSKMveqT60cA XSDK3zN+KHT3y4RZgggCWS1Cs3vFFIZk6GEOBelveLhfaKYU7FWE+lm6DQDNpnI15fRT n0Lmfd7IuYZtkz8vteKd4IgOcMtV+Qf6OQwokABUyegbyHTexF5WvsvMi6MXY8i4KCAn OfrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=I+FqyP3f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id na4-20020a17090b4c0400b00246a5991cc6si2904205pjb.162.2023.06.09.08.38.20; Fri, 09 Jun 2023 08:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=I+FqyP3f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241036AbjFIPZ0 (ORCPT + 99 others); Fri, 9 Jun 2023 11:25:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241524AbjFIPZO (ORCPT ); Fri, 9 Jun 2023 11:25:14 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAA7235BE; Fri, 9 Jun 2023 08:25:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686324312; x=1717860312; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zHjAgdVUBB0uVbkIgjmznv/ebWgxcQFRvgnhOx3Y82k=; b=I+FqyP3fmtGL4UXWxvjPPrf9JOsNIpmpUW9m1LAw6sEfXXeA8ozKYWoZ JdIHBK0hk/rUEpEr+ARuCSGYVrF3wkIqVio6sdTnnyzq1W9/w487hFQbq tdFdiV4ni06do0qWWXo1s3y+5/Qs0ag+wY/IQgdvg3S+t7hjmimLxy52j 1i/LT1IgLiHvDDGnasWAJbg29t7pXryHqEbmdGTvLTyKCQanIl0hrdDkq HGGxtVO2j9q6HHwJSqvagur/UXJv1xS1tVFf2J4l3VaY8pyYVhcerU/QI 9Bp3GnDqo9AOr2aZBxBZ22TuNZ6uWVTsCsiJ6YJqTpo/4+s8OE1GJX5ne w==; X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="357623195" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="357623195" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2023 08:25:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="775532602" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="775532602" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 09 Jun 2023 08:25:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7760E56D; Fri, 9 Jun 2023 18:25:14 +0300 (EEST) From: Andy Shevchenko To: Serge Semin , Damien Le Moal , Andy Shevchenko , Greg Kroah-Hartman , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Hans de Goede , Jens Axboe , "Rafael J. Wysocki" , Len Brown , Daniel Scally , Heikki Krogerus , Sakari Ailus Subject: [PATCH v1 2/3] device property: Implement device_is_compatible() Date: Fri, 9 Jun 2023 18:25:06 +0300 Message-Id: <20230609152507.77649-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230609152507.77649-1-andriy.shevchenko@linux.intel.com> References: <20230609152507.77649-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768240040560762403?= X-GMAIL-MSGID: =?utf-8?q?1768240040560762403?= Some users want to use the struct device pointer to see if the device is compatible. Provide inline helpers for them. Signed-off-by: Andy Shevchenko --- include/linux/property.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/property.h b/include/linux/property.h index 695053c60306..8de2c707818a 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -85,6 +85,11 @@ bool fwnode_device_is_compatible(const struct fwnode_handle *fwnode, const char return fwnode_property_match_string(fwnode, "compatible", compat) >= 0; } +static inline bool device_is_compatible(const struct device *dev, const char *compat) +{ + return fwnode_device_is_compatible(dev_fwnode(dev), compat); +} + int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode, const char *prop, const char *nargs_prop, unsigned int nargs, unsigned int index, From patchwork Fri Jun 9 15:25:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 105710 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1032832vqr; Fri, 9 Jun 2023 08:42:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kHofnoezOCkHuMgxhqSwuJE3NdKBHzvOgIb0XoxMGFbIuS84Cy6ZLJVaA7h+qy00a+Id0 X-Received: by 2002:a05:6358:bb8f:b0:129:bbb2:39fe with SMTP id df15-20020a056358bb8f00b00129bbb239femr1357867rwb.32.1686325374958; Fri, 09 Jun 2023 08:42:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686325374; cv=none; d=google.com; s=arc-20160816; b=NHcJZ4i3fLfD0A2Qazg3PbwKcftxLaI6QZwurhGZ9O0HFBkiAq305aM1RCmTLOIgtm qxQj/SuG/nTH3iOknkGcGUS80t/98ojHyK6I48FEvp2RtI+WIenOSaHBnr0FwDKNnjXY f675RlgMtua9gx6L8beo3ewxWr36TWI1RZF5VDTmUICzWFRdiaNu/S6RDdbETsBDcuuH HWzAuB6zPRgT3ZrmKr7tWEwT23sL4EzSS2d1YdvN1FcJjMqsSKF7HUIy5yfLqKjCFPa5 3FkStKsim6roYR6EXYnpVSQHIdHwOrD5g6WLV4xHo9Cl0n+8J0CkzhHAdGQpxZI2h365 q6QA== 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=bRwQvlIkjwTztxCbgadzpvOe38wy0Xg553akUPt9M60=; b=dIJfD98/JFiZ+Y7azA8+dtPePTBxLuG2zXZosDnc/5VHLQA5lz3zMUnj2htwOt3deQ HFcLfYgj08dmyJxAC0oTnI9IkSWEkRa1eGrAVmvAKDQbFHrPpZyNcTVnD+SJChN+CtPi Y721tvAICNbYl+Roc9RhZf7TAX2lXNFkst81x8oQ63+s9udEtsSi6GX5hEwVXSt3ZtXv dXuEf2jxQ880s5BX7K3bq/tQjTH9kgUpTXivrqCcZClX9oCAXOzwm8419RQ/zcI3xgAt aHYX1/jeHFzuGhnMfZBu34AtzZpFvOoim78mv9+dlaesEmiqm7wjySFNWxa/ix8Xory/ k9kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EJa5g5Pi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n184-20020a6327c1000000b00543a89c95c2si2763034pgn.207.2023.06.09.08.42.38; Fri, 09 Jun 2023 08:42:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EJa5g5Pi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241740AbjFIPZe (ORCPT + 99 others); Fri, 9 Jun 2023 11:25:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241495AbjFIPZP (ORCPT ); Fri, 9 Jun 2023 11:25:15 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6CBE3A94; Fri, 9 Jun 2023 08:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686324313; x=1717860313; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JiZcSEh6wtKIXhWUTQdPeLqGPLC1Yi/N2wixH2YZSZk=; b=EJa5g5PiePvyG4IjnlFH/h6ujKDStd8TMIcJR4jrVlONViWLjRAavmSu 0HQr7P4KV3vEsJIOKC0dfh8eWea2H4DXym4+NS8f3yJ15kssP7F3AHugi uR1gYcPFns+X6af04g89PpjhIZPCFZeRerTo6Q26gKyBQgH1lRhjyWFI4 ug8XT6IMjbfZ85Sq+CIE0DFEo0ROTfGVxZYlGzspc5Hl/RREamd7tLYZ6 gSrR5H3Aqn2lIWZp/9r25QOz8gEeo+rSrdBv1nAPJoA9EaAniEkLMi+LP 7wTq2bjWiKy+E66GKFbF7YVSYbuOAgC7FOfjTv+EiTOlAaIG9vKc9R4Bt Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="357623189" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="357623189" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2023 08:25:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="775532603" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="775532603" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 09 Jun 2023 08:25:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7D70D34F; Fri, 9 Jun 2023 18:25:14 +0300 (EEST) From: Andy Shevchenko To: Serge Semin , Damien Le Moal , Andy Shevchenko , Greg Kroah-Hartman , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Hans de Goede , Jens Axboe , "Rafael J. Wysocki" , Len Brown , Daniel Scally , Heikki Krogerus , Sakari Ailus Subject: [PATCH v1 3/3] ata: ahci_platform: Make code agnostic to OF/ACPI Date: Fri, 9 Jun 2023 18:25:07 +0300 Message-Id: <20230609152507.77649-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230609152507.77649-1-andriy.shevchenko@linux.intel.com> References: <20230609152507.77649-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768240316103640280?= X-GMAIL-MSGID: =?utf-8?q?1768240316103640280?= With the help of a new device_is_compatible() make the driver code agnostic to the OF/ACPI. This makes it neater. As a side effect the header inclusions is corrected (seems mod_devicetable.h was implicitly included). Signed-off-by: Andy Shevchenko --- drivers/ata/ahci_platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index ab30c7138d73..71a18344a0c8 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -12,11 +12,11 @@ #include #include #include -#include +#include +#include #include #include #include -#include #include #include "ahci.h" @@ -56,7 +56,7 @@ static int ahci_probe(struct platform_device *pdev) if (rc) return rc; - if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci")) + if (device_is_compatible(dev, "hisilicon,hisi-ahci")) hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ; port = acpi_device_get_match_data(dev);