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);