From patchwork Fri Oct 6 22:46:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp635782vqo; Fri, 6 Oct 2023 15:47:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwW9oB/k69y0Yq8gZhxOhkiNg745BYpRfrehOptihrCM71BgWFcUfZVBJ4eMq4X/BTus2X X-Received: by 2002:a05:6358:281e:b0:145:63e6:8710 with SMTP id k30-20020a056358281e00b0014563e68710mr11356032rwb.23.1696632457264; Fri, 06 Oct 2023 15:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696632457; cv=none; d=google.com; s=arc-20160816; b=nC7ChIE4jskVQGmGniXA8E/ZslmoI0PIbr0wavvaPpMYYTZFpxNmGE45zWG19EBk23 oX04yo8rr1kU4OYAs4fOU1z+SuJvxfUvz9jmBh377ge+89tbdh168cG7T64ywY8vS52M wwnlZ+NIaQQahJoL8HoGUrYnn5dQeIA9KOfE4/Hdj45Uo+/lw8WpLHSCUob4g32g1lUY K+MgXYLyTMptrr0aA81aYDGGkvMFf9V1qeVXjg4SHIPOdAO8H+omPFPLhCEssiN6yC2q xyo7yvY1/m4qekuXfFvZr7y3xud1ZWfZh1G6cKezJQqklgpEodGi73V3WuCnLmg8b9Fd PUsw== 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=euxqbI8HQSD/zaREKa7cd4JsHtRBFW/HuQwYexF25SQ=; fh=YwH1/rtY0YDpf3ikrLXjvcq2PYyWx4Yz3m7l9DxHGyQ=; b=giCpkZ9axQ7UB7ttNr0g+buB6/e49mtuj1QOpU++xWmSYrinMmReBLvlvN4oBYpXPo 5a+JALREE2PJKFojgOZnLUYatDfsLKJ0zJJGyvWF7sbVnhYfqIqVWDPPpkVmdmvlXyOR 9Nvc1//z5wMbpq4DZbcSkt4ZpmQUJxR+qbu2xk4UX0mq9ApZOAoNZjTobzS7VvtR4hlb Keuy+eTwX953WUM2E9vUvdCoPJ3Zzd0xCP52lhEWCEVEa7ICztldKNuoEYhLu3+cveDp NqKnxpCn6G66VUwHO60kYCKYEdI1860RPklkxzcgdwO7P60AXeqPekZf/OiCG5yfxUJ4 H+9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CnU8Ad18; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id sf9-20020a17090b51c900b0027749a1fe74si4507788pjb.182.2023.10.06.15.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 15:47:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CnU8Ad18; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id B451E8035360; Fri, 6 Oct 2023 15:47:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233881AbjJFWrQ (ORCPT + 18 others); Fri, 6 Oct 2023 18:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233854AbjJFWrM (ORCPT ); Fri, 6 Oct 2023 18:47:12 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09BCB186; Fri, 6 Oct 2023 15:47:03 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A622C433C8; Fri, 6 Oct 2023 22:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696632422; bh=dHi+uhc5JmMdS0vOiwqKPO+fur6fetbxxWrDuMzxW9s=; h=From:To:Cc:Subject:Date:From; b=CnU8Ad18XEIdVWdtF4JdAtf7WJ2CELAZ2WRm2m0xRt8N5et7x4Wh3M8ssQJPxU9OO i+ZlxgeMi93T5Q8wSL1pbql+nd4RYdx320qpVRts/bDOYNH1cFXMxOay4xDWYuKQDR uLjSFfbacyGbia+E1IVhVntZVz4R0LgPJ/kUBITGptGytiOv8F2Cnk70aNZ+vbSOVZ gpcw2RJy0GRrTVWrWHactuKXXjcBO+v5vPvSM3mOWtvfONOT+v/SWNv8r7943OX+Y+ NXdc9+9UJ8GRFojR/7KMJJpOKEvS7MA3gyH6S11aHkQ4rjmaOBUmvnwuxc5mTBnKTE scBjoS2MX1W5A== Received: (nullmailer pid 445636 invoked by uid 1000); Fri, 06 Oct 2023 22:47:00 -0000 From: Rob Herring To: Dinh Nguyen , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] EDAC: altera: Use device_get_match_data() Date: Fri, 6 Oct 2023 17:46:57 -0500 Message-Id: <20231006224657.445561-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 agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 06 Oct 2023 15:47:34 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779048075753155025 X-GMAIL-MSGID: 1779048075753155025 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 --- drivers/edac/altera_edac.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 8b31cd54bdb6..541acf5eba05 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -279,7 +280,6 @@ static int a10_unmask_irq(struct platform_device *pdev, u32 mask) static int altr_sdram_probe(struct platform_device *pdev) { - const struct of_device_id *id; struct edac_mc_layer layers[2]; struct mem_ctl_info *mci; struct altr_sdram_mc_data *drvdata; @@ -290,10 +290,6 @@ static int altr_sdram_probe(struct platform_device *pdev) int irq, irq2, res = 0; unsigned long mem_size, irqflags = 0; - id = of_match_device(altr_sdram_ctrl_of_match, &pdev->dev); - if (!id) - return -ENODEV; - /* Grab the register range from the sdr controller in device tree */ mc_vbase = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "altr,sdr-syscon"); @@ -304,8 +300,7 @@ static int altr_sdram_probe(struct platform_device *pdev) } /* Check specific dependencies for the module */ - priv = of_match_node(altr_sdram_ctrl_of_match, - pdev->dev.of_node)->data; + priv = device_get_match_data(&pdev->dev); /* Validate the SDRAM controller has ECC enabled */ if (regmap_read(mc_vbase, priv->ecc_ctrl_offset, &read_reg) ||