From patchwork Fri Oct 6 21:44:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp610795vqo; Fri, 6 Oct 2023 14:45:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/TKbQon9UF52r8sMTgYMvuuMK7mtgpljIqCzyWWazgSDadgja335AbYva1YzGxc7Fpmp8 X-Received: by 2002:a17:90b:1056:b0:274:67d0:f57 with SMTP id gq22-20020a17090b105600b0027467d00f57mr7838834pjb.48.1696628709155; Fri, 06 Oct 2023 14:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696628709; cv=none; d=google.com; s=arc-20160816; b=z+fqriCwfGA7xu3vtFGvcg4S5jrKP9nh2jwBuwZkWabtFiRbfcc/lnpyzHscMWP7Ve drmJ5iR1BQdQJHuAiz4S3MTd4hSogNp46zN/hTNuFhxqbgM1Vc/DVr+6yrG0yKWPfs/T 9DERGlfjQE17C0puldZf4/VqOlCE5fHN4JApMv5MJAFNJmQPRLYSNpnoVrYu1/AKiuOQ QwKL34gpnj5F4tjLvLNwfK4FB3rpFFdbJ5sJf9TnQvzqMU183tvtlB/HcSeyZWWkYmey cVcY4yEmYBGDnW7GUslNKUM1QXOldlEUMYEAzZUJvqQR926zQAItGrq/X84HOx5cQHHK gSFQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=I9PsFoNARmzLRQl+aWCMB+2Yrer28wJnyJsRsOTDMN8=; fh=ro6gPE4ZGXeuMUns6/M6SWqXYyzj94CHkdRAxzOyolw=; b=Qyl/8NndCIVk1R7xKBygjTLVa/R+IeyvFvzqKzwqVBVDabiUgL6mxNc5d+BS2U2KcO eVwS1bEpJ9A4Cal+1r3QYHzoSUIH5BxacmSyuTEzKoKvrk1yajKUygZQPMRIGqljEbSP r5HxaEdqZtb93dX0i7YvAJ0c26ziXE75fNun1bmqor433qkU1m9RZO+cc/DuNVQPpMcm YgjQv5ZuF4rOQwJiVFO4x/t3QSmFKRHdpC97m3RtNZ+lnPQdpczmwWz2g+0ZPp1L9VDc T4cUxTFcpDvmXJ+WBsB3BuYLU5z1B+/Ir2m0mZ5+o6SZBAAdHd2rQFq8I/VXyLWj+IyW NycQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TSBhAOcJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id mq7-20020a17090b380700b0026d01e90c10si4847849pjb.65.2023.10.06.14.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 14:45:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TSBhAOcJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 53F908364E30; Fri, 6 Oct 2023 14:45:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233771AbjJFVo5 (ORCPT + 18 others); Fri, 6 Oct 2023 17:44:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233783AbjJFVoy (ORCPT ); Fri, 6 Oct 2023 17:44:54 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11378F9; Fri, 6 Oct 2023 14:44:48 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89A98C433C8; Fri, 6 Oct 2023 21:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696628688; bh=mu/lIRhJDrCa7DuHJvaUMHjw/zy7mbs5KoPEOxnbT0k=; h=From:To:Cc:Subject:Date:From; b=TSBhAOcJ40um/DnGW6VF0LUGqiQWQtk5DVI0qLo0afN46m9Xmuh4QXssoH8qNRmER qXE953NsjLMgoaALnMZ/Swe93zYeNA42nsxeSJZEs7y1B6dfpg9J5hdjPgHTLFGUh1 rHLP3mWhnoHLW3KSB8Ac+rPr528O/+FT2DSjP5Rq8MDmqqlQnxCmV9OhzSs/WKccGS akG1DmD1dKVSWmWf9CibKm8RsO/d4dj36xQoSgT1hg5kPq43ISOieD0HCajAujqH2/ Qejz3uvnqZ+XTFfUuhhMWFhKRa9LE43DKR9O2hDnNlMZ5lZdpECHH4brC6fH+xhLf8 norMmTCcH1T/A== Received: (nullmailer pid 339997 invoked by uid 1000); Fri, 06 Oct 2023 21:44:46 -0000 From: Rob Herring To: Damien Le Moal , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ata: imx: Use device_get_match_data() Date: Fri, 6 Oct 2023 16:44:42 -0500 Message-Id: <20231006214442.339890-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no 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, 06 Oct 2023 14:45:05 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779044145533554843 X-GMAIL-MSGID: 1779044145533554843 Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring Reviewed-by: Niklas Cassel --- drivers/ata/ahci_imx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index 9fa005965f3b..cb768f66f0a7 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c @@ -9,10 +9,11 @@ #include #include #include +#include #include #include #include -#include +#include #include #include #include @@ -1050,16 +1051,11 @@ static int imx8_sata_probe(struct device *dev, struct imx_ahci_priv *imxpriv) static int imx_ahci_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - const struct of_device_id *of_id; struct ahci_host_priv *hpriv; struct imx_ahci_priv *imxpriv; unsigned int reg_val; int ret; - of_id = of_match_device(imx_ahci_of_match, dev); - if (!of_id) - return -EINVAL; - imxpriv = devm_kzalloc(dev, sizeof(*imxpriv), GFP_KERNEL); if (!imxpriv) return -ENOMEM; @@ -1067,7 +1063,7 @@ static int imx_ahci_probe(struct platform_device *pdev) imxpriv->ahci_pdev = pdev; imxpriv->no_device = false; imxpriv->first_time = true; - imxpriv->type = (unsigned long)of_id->data; + imxpriv->type = (enum ahci_imx_type)device_get_match_data(dev); imxpriv->sata_clk = devm_clk_get(dev, "sata"); if (IS_ERR(imxpriv->sata_clk)) {