From patchwork Fri Oct 6 21:43:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp610400vqo; Fri, 6 Oct 2023 14:44:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqZYjcUewCEQXUOmldAPsCrgjeMmMqXnpCIKgepZmPTn6GwpmSKXXaybfCtRBPHWmYDMs3 X-Received: by 2002:a05:6a21:3381:b0:134:2b31:e2a9 with SMTP id yy1-20020a056a21338100b001342b31e2a9mr11389921pzb.0.1696628649114; Fri, 06 Oct 2023 14:44:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696628649; cv=none; d=google.com; s=arc-20160816; b=qp7rcRqeDZ5D0+TSCQdPL5/lmASdeqFZYE2jJQG3msztGf3VHpt86O33UE17UyxzBD EuKrkOcYncswJ+GXXPOnMqkvb/IM5pdF8P9AbLUU3I1v4yZGaDEU2P6tE3OP7loMvC7t HpXTbPrtlwGQUdV2ox/SkbeKfAUo6LbMfF7z+geV02QzFoioEuKqvRCEfeag/YlQUgJS 2LpZeyOAir0rToSDKFCvYt4rseo/iud1HSbzm8XgQL4/NN+I6GVRROpWc1bSXQWfS4wJ UcumXuTRsiaVd5nW0tFuoh/eJqLc+gR3zSpQFBaUPm4iWxoJXueBPOYiMcyO8C7vX6E6 0juA== 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=rgmz55VCFF8gFQsolIMtlfAQ/nWU5zPwToc3tIAhYNM=; fh=FzXTu5G5K+fN6Dypl4BlqEXoPlHuyERsc8yUkzHvbc0=; b=bxC1ld4C1taIIAul0fwUIwS9VU2vpvsSmDrR406aV/X+ThEXtkHZs1YImaGOh/6k6L FXYSAdC7iKUJhCDM0U0d3UEC+M8yK5/1Q7Q2XD1LP+JqLmQ2VRBb+3MTiMsbIn2S/WYZ 7nyzBEl6sRIDj0p4Rt5+Vh50+2gYKfJS1rwqpIMpUDOQnokjOqJnSgVHuA04MQZhJYRg l18K6hUO7S4ukVpZwdn96RdCqLzq2bwVfbp9xUdjs42WmmvaH/Pt6GKdKoh3TxO6qLcr nMMazlZMyzFUEazCm331Pllo9C8Jvytiel6H7F/V1TeXGlvL3t1rDnfKnkc6T48MRZMw y6UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LhFD1pSz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id j37-20020a634a65000000b00573f9a427d9si4370980pgl.717.2023.10.06.14.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 14:44:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LhFD1pSz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id B385982157A2; Fri, 6 Oct 2023 14:44:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233704AbjJFVny (ORCPT + 18 others); Fri, 6 Oct 2023 17:43:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbjJFVnw (ORCPT ); Fri, 6 Oct 2023 17:43:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31E41BE; Fri, 6 Oct 2023 14:43:51 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E698C433C8; Fri, 6 Oct 2023 21:43:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696628630; bh=JxKvTUqfP6X/thRxp0Sb58Y81IsFbCSSCaPiysJgstc=; h=From:To:Cc:Subject:Date:From; b=LhFD1pSzwcoyLl85ZonWuOjB1KhaBmVEOgnb47R4hiNxz94poqXgpgWkib513rpw6 pVC/EhJLj6eBsph2dD/wZlPtVmxyBVJnm1O+chHjuGABKiW9NhQcARcNSxAOFrAGAm IYUOZMz4qc+JNqdRbC3GcyPKMmL/vat6PMccQNPkaZfGHh9xbAX1cCDO02A2nDWbmC J9r0GK+E4mCUDmG8A6hTvBw3Q+4KimdWtX6IwtsqNUWYRoq3dRla6PTDXnCx2D/7LX 8nYvreOxjLs57esLH2iK/1z/G+aRso4ay2klkJ76NCFO/qWyxASIsVcb3RT1MPprvY RjfM46TkTPmSg== Received: (nullmailer pid 338802 invoked by uid 1000); Fri, 06 Oct 2023 21:43:49 -0000 From: Rob Herring To: Olivia Mackall , Herbert Xu Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] hwrng: n2: Use device_get_match_data() Date: Fri, 6 Oct 2023 16:43:40 -0500 Message-Id: <20231006214340.338620-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Fri, 06 Oct 2023 14:44:06 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779044082341726911 X-GMAIL-MSGID: 1779044082341726911 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/char/hw_random/n2-drv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c index 73e408146420..aaae16b98475 100644 --- a/drivers/char/hw_random/n2-drv.c +++ b/drivers/char/hw_random/n2-drv.c @@ -14,7 +14,8 @@ #include #include -#include +#include +#include #include @@ -695,20 +696,15 @@ static void n2rng_driver_version(void) static const struct of_device_id n2rng_match[]; static int n2rng_probe(struct platform_device *op) { - const struct of_device_id *match; int err = -ENOMEM; struct n2rng *np; - match = of_match_device(n2rng_match, &op->dev); - if (!match) - return -EINVAL; - n2rng_driver_version(); np = devm_kzalloc(&op->dev, sizeof(*np), GFP_KERNEL); if (!np) goto out; np->op = op; - np->data = (struct n2rng_template *)match->data; + np->data = (struct n2rng_template *)device_get_match_data(&op->dev); INIT_DELAYED_WORK(&np->work, n2rng_work);