From patchwork Wed Sep 20 18:47:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9962033 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 09F45601D5 for ; Wed, 20 Sep 2017 18:49:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFC0D2868C for ; Wed, 20 Sep 2017 18:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E42A82920B; Wed, 20 Sep 2017 18:49:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6175B29203 for ; Wed, 20 Sep 2017 18:49:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751521AbdITSth (ORCPT ); Wed, 20 Sep 2017 14:49:37 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35302 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751367AbdITStg (ORCPT ); Wed, 20 Sep 2017 14:49:36 -0400 Received: by mail-wr0-f196.google.com with SMTP id n64so1974760wrb.2; Wed, 20 Sep 2017 11:49:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XliNWvY8GI0pgJNI2yvwGWTtPzFTbyJKDf+7IGFcrRs=; b=FHKGOqDBGGnUMoslWkxp1tTENiVhYOJezpGWC3aGqn0Cg6vBqotmARTb7T4Qs5IIeU brjA2k8/8hFl0JbEZC5rnAYQnO5w2OhEsvqHYwtPQCInkYxOUamhRoiASHfB4WA+/MBh ZTCmjIfn7bWUtRzWhQJB2YUbH1fTVRqFoTE0I2QF+IMLTDzFfeqN2qvlGK0Sv8XYwnNV EZ8tmMZAr2bDGJ1WHH88qM+rwFkrtIMpuuQZCQf26Zed9GtWfv0+dME/yS/JEc6ti0Yc O0C7I7WSbb1SVZnqYD8j7XmcnLwy3LNiheZ9Wf+rMtiURh7K6MO4gO3GYsy54M25zPzM OnVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XliNWvY8GI0pgJNI2yvwGWTtPzFTbyJKDf+7IGFcrRs=; b=CSHmPj231+HfVnbuKeR8a9Rqx+etV69Wvn3A+dBIECxRwmjJehiW1yMWFsqc2wjk+2 Xg276UGFVXJLNsFKwo0fRU3Xk6PlCU+HeWlp8G6O7Xw1mRByPlOtyFRSe48PBMOecAMU Kn7EBRxcaeP7gOU1Ku/zz/LMlwLMabfY23xMch6KkfhtqPBAIjbNFCi2hZkuBe9AY22r p6GDJgdqfuTC2oRv8rA//6aEuTnhC8vrBvas3K4qxpkp/GVM/SYgwrg8XKEgkoVytoIK Oc8RzCgi4kGn+OxV+LntXj6ff1SnfF7ZkYTV7LBTily7kXcPvd86b9VCdiu8AxOiXuSS krPg== X-Gm-Message-State: AHPjjUg9sT5IjcWG5HimWr3DhQ+KHJLmqJxGGpTxR+MS2Yg7nRBAZPHo coKtWzfeUXU2nYI/AYQqSyfeIg== X-Google-Smtp-Source: AOwi7QABvWz64waVogLGRNoUlB8+zhYtkJgN2IG5joievoXql4tGScLCtjgoWhTLgmn0bkYCUagrDQ== X-Received: by 10.223.153.117 with SMTP id x108mr5008298wrb.202.1505933374985; Wed, 20 Sep 2017 11:49:34 -0700 (PDT) Received: from Red.local (LFbn-MAR-1-580-96.w90-118.abo.wanadoo.fr. [90.118.159.96]) by smtp.googlemail.com with ESMTPSA id f5sm2258256wmg.10.2017.09.20.11.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 11:49:34 -0700 (PDT) From: Corentin Labbe To: herbert@gondor.apana.org.au, davem@davemloft.net Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH] crypto: bcm: use of_device_get_match_data Date: Wed, 20 Sep 2017 20:47:26 +0200 Message-Id: <20170920184726.22706-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The usage of of_device_get_match_data reduce the code size a bit. Furthermore, it prevents an improbable dereference when of_match_device() return NULL. Signed-off-by: Corentin Labbe --- drivers/crypto/bcm/cipher.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c index 537a67483aa3..92e97a6da811 100644 --- a/drivers/crypto/bcm/cipher.c +++ b/drivers/crypto/bcm/cipher.c @@ -4818,7 +4818,6 @@ static int spu_dt_read(struct platform_device *pdev) struct device *dev = &pdev->dev; struct spu_hw *spu = &iproc_priv.spu; struct resource *spu_ctrl_regs; - const struct of_device_id *match; const struct spu_type_subtype *matched_spu_type; struct device_node *dn = pdev->dev.of_node; int err, i; @@ -4826,14 +4825,12 @@ static int spu_dt_read(struct platform_device *pdev) /* Count number of mailbox channels */ spu->num_chan = of_count_phandle_with_args(dn, "mboxes", "#mbox-cells"); - match = of_match_device(of_match_ptr(bcm_spu_dt_ids), dev); - if (!match) { + matched_spu_type = of_device_get_match_data(dev); + if (!matched_spu_type) { dev_err(&pdev->dev, "Failed to match device\n"); return -ENODEV; } - matched_spu_type = match->data; - spu->spu_type = matched_spu_type->type; spu->spu_subtype = matched_spu_type->subtype;