From patchwork Fri Dec 4 14:58:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1411057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=ov+e1KD3; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ipDRBNFK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CnbX96sN6z9sWj for ; Sat, 5 Dec 2020 02:02:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=3r8sfuCyEJOZUck3E+uKSweUj54b4M5E92M7Shn2RSo=; b=ov+e1KD37M1Pw7WnlXOIZz87JY Eb5oPjeuD7hSYUugPTDOPXydyQ1uBg7BkwidJMGKKb5dR1wEhtsJxUntpvHGThXlJE96w9LzgjFck mamSUgKbD20pmf3sxlvnw4PxuPEracwURsznB4XehPUwEaSW4j1Kf18i76g5NGk4y7/Ctg0Y3ytpL KpB7uWy+wyCjf9X2K+bxir6R2adxsAMH0UW/1r/HqMimsSAJxos3FWI15wq0sAGBzv5jcYDgrQJb7 GGHSlL1vaBYmJwx4SImII4aVbR1LfEbOYDXDtUIvG/bZ9AhzI/lkijjMejrQx/pboRoFhbNJKpZfN ZB7c3muw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1klCZm-0000mY-PD; Fri, 04 Dec 2020 15:00:50 +0000 Received: from mail-qv1-xf41.google.com ([2607:f8b0:4864:20::f41]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1klCZi-0000kL-74 for linux-mtd@lists.infradead.org; Fri, 04 Dec 2020 15:00:47 +0000 Received: by mail-qv1-xf41.google.com with SMTP id 4so2881485qvh.1 for ; Fri, 04 Dec 2020 07:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=x91ziFr9IjaRA+UG3mGYQ/hsz2KhJaVjfrIEoefHpGQ=; b=ipDRBNFKzTILYAtZ01etYZj2u+m/s5w43HeujGtQgKcv/la9zdCGclFaMi95HXvsuy mJXl+IdRaxyG4FUvGdrJQDq7r/97DGAFBtn1uJcG+lCMjRWTBx+22ktcKDs7cfZdR7mF r9HCDbaLRQVQfuVhg5mic3Nn6jil1PO9NG9xqAHCLbEDzvRRlideVlXdj+HrqrKpwPHu 9dPpQcVRYNoglgynUl7eP0/3+h4iacPa82BQhssh9A+2e1oQrP+uWvUa+fI4Lgc7wR8P +PoVsCorKDWs4VWBGMTy7I1gFqm5oODOiNmmA9NVxhj8BY4xWrga7z/tP1m0aRcoSBXN waPw== 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=x91ziFr9IjaRA+UG3mGYQ/hsz2KhJaVjfrIEoefHpGQ=; b=Z/T5i3yZV8hMFg8guCQVDIQJRcPr7mgQSe2BEwMbVml2Tl2Ai+gfgpkOE0HVvxNwZG 7i3fN9arPHTT4GJsHubM0aTbbW8IuWe4AooIy+6xaI7ddZBSw8qDk30D/rjj5oSCoSA4 jLUftlmBW+ifgKH55a1pzGpuNlW9gAKKx6qkLsz/1PsucNNlPSeW0c4xzagmWxes94fA zDnNAQhvM3JGA9B3uXcGsVDlOfbnGURKRQ2FpgukSDnKaioXgXiQz8XIitBt28gCVhx4 Zz6loRTQGGZP5mSLUXa0uVMlurT5Lfvg8i5J+rSA/ie+QgAx2cTnlOpY8GpEhngpaWRh BWoQ== X-Gm-Message-State: AOAM533p8vh7P+99Fb5RpTQ2dHFuF/nhLM5AOIySWLU6M5fQX7GpQfN7 GdGRNZ6P34V40hToz9xb3fM= X-Google-Smtp-Source: ABdhPJzHPddBWJfvNcrCYx4OVsrYY8/oSYSpYVOR0wn5k/t3BoUH1XEumRlgRN2oButUeqoytgvPig== X-Received: by 2002:a05:6214:973:: with SMTP id do19mr1556886qvb.26.1607094042724; Fri, 04 Dec 2020 07:00:42 -0800 (PST) Received: from localhost.localdomain ([177.194.72.74]) by smtp.gmail.com with ESMTPSA id h26sm4806456qkh.127.2020.12.04.07.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 07:00:41 -0800 (PST) From: Fabio Estevam To: miquel.raynal@bootlin.com Subject: [PATCH 1/2] mtd: rawnand: mxc: Use device_get_match_data() Date: Fri, 4 Dec 2020 11:58:17 -0300 Message-Id: <20201204145818.32739-1-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201204_100046_325209_2FAEA9BF X-CRM114-Status: GOOD ( 12.19 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f41 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [festevam[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , linux-mtd@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The retrieval of driver data can be a bit simplified by using device_get_match_data(), so switch to it. Signed-off-by: Fabio Estevam --- drivers/mtd/nand/raw/mxc_nand.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index f896364968d8..d5c445eb93ad 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1714,7 +1714,6 @@ static const struct nand_controller_ops mxcnd_controller_ops = { static int mxcnd_probe(struct platform_device *pdev) { - const struct of_device_id *of_id; struct nand_chip *this; struct mtd_info *mtd; struct mxc_nand_host *host; @@ -1756,8 +1755,7 @@ static int mxcnd_probe(struct platform_device *pdev) if (IS_ERR(host->clk)) return PTR_ERR(host->clk); - of_id = of_match_device(mxcnd_dt_ids, host->dev); - host->devtype_data = of_id->data; + host->devtype_data = device_get_match_data(&pdev->dev); if (!host->devtype_data->setup_interface) this->options |= NAND_KEEP_TIMINGS; From patchwork Fri Dec 4 14:58:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1411056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=c2CKFv+m; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=kbTXpbUm; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CnbWs0PrVz9sWs for ; Sat, 5 Dec 2020 02:01:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dkXDvYryz0g2X214rWe/ugYHhb9QWsPclQcw/BFzl0w=; b=c2CKFv+mMKQrwIGsG47QmQvrFS b9tcQhU8+tGSDsx6GQsRYVK7oTvnxBOKzXnGDn+uzpI8lX05pNfls8fSYKipX7tw+Mwg9OYTsMUSX zIAbehKuWuSBTPwL4R43bCBUd0dXDkmahA3BzzQ1CbURpjBsEiNvij3fBbx/hU/JTL/zicpax42+q X7rMMhBXI1qjNSLxmXRu0gsZ0fEXTyzZgwp9jN5FEYWYD/iW6gHZH1qeflgUJoZ16CB7h5dBAk4VL slRHdSfg0fo2ySuY9yOQ44iB16zWCMFsdQCrSSPXjw/kCkkvkMPfvSmZ6g5jgjFMfQHj8VjgQp9CL 3y4NYpqw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1klCZp-0000nE-2j; Fri, 04 Dec 2020 15:00:53 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1klCZj-0000ko-GA for linux-mtd@lists.infradead.org; Fri, 04 Dec 2020 15:00:49 +0000 Received: by mail-qt1-x842.google.com with SMTP id l7so4068556qtp.8 for ; Fri, 04 Dec 2020 07:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qleO8M+WXJdEU0AezE0Gsb+HzikHnU9EzBeKI5HtrQo=; b=kbTXpbUmXmHE8k/8nfqNo8Mem8w7ovGTrnER+sr/zSRfPnJ0O6zIKN3vYkFDj7CiJO oKMFIMl1deXNrmJYshWV2Evr0fbRLNE8d+EJ9WEntluL9wgK9zquY8pUFyFtHMTVhl8F 00Psm6bsWZYEfEPeAKnuplcy7jE/H0acnzo4aPMXQ6Zm7sLqWdhol0YwQzk0lSYeT8He jQiZ8XLBIYQMJwpOLHURdIHSD6PAK3KsoMpV+QFeKpZTiKKIL/AOgJjyJJf8pOqFjzW1 TZtuwchdGtOJNqg+KULMeeF/Jo1lXlR2xXQyEGvb5x8CPyW+3pu7QxlHfQcEv/ieUhRj rrBg== 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:in-reply-to :references; bh=qleO8M+WXJdEU0AezE0Gsb+HzikHnU9EzBeKI5HtrQo=; b=bqmbWo04fqtwu4dY1aroRTqcDFiNOj7cSzzUTD1meVo8jfpP3whDzWGuNwf0Fw2cXK HtVAyDDZ2wMqslMmsXmDjmYZHzdiDmvWVcciMsabKpfLZ61Gpcv7I5HlBr9uA85XmN6W K9uiDJol9n3qugvvjvEIyTvt6bN0KJrW7rl1NffmHstn3puNkRRyQkaFc9Djz/ZU2pqk iGlnWv2gU0o+gueK7UtAE9koX8AsQqTuI1uFPO4MFPzROX9Ih31NF3sU5A9YQaj0ohM4 cnyLl3Xnkvuqm5wrPmBSq84+Xe3YuaNruDPKTJMLKjPudHkvV3pIe0ruWciKUbLysPla C2PA== X-Gm-Message-State: AOAM532z/ohLpAeCqRNTCeC1OJhR3nwasZVKX3dUBZ46RaaU7qU7nOSn 0pmhtlvsdkd/aUc0l4DMk+w= X-Google-Smtp-Source: ABdhPJzA9c9IXytQ711eHoOZy46CavA0lU24kmCCr2tqHM1m/Pm2BQS2YXyT4Zm31/eVT1Ti3CyeeQ== X-Received: by 2002:a05:622a:d:: with SMTP id x13mr9784189qtw.374.1607094045144; Fri, 04 Dec 2020 07:00:45 -0800 (PST) Received: from localhost.localdomain ([177.194.72.74]) by smtp.gmail.com with ESMTPSA id h26sm4806456qkh.127.2020.12.04.07.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 07:00:44 -0800 (PST) From: Fabio Estevam To: miquel.raynal@bootlin.com Subject: [PATCH 2/2] mtd: rawnand: mxc: Use a single line for of_device_id Date: Fri, 4 Dec 2020 11:58:18 -0300 Message-Id: <20201204145818.32739-2-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201204145818.32739-1-festevam@gmail.com> References: <20201204145818.32739-1-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201204_100047_577400_DF7D9C3B X-CRM114-Status: GOOD ( 13.37 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:842 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [festevam[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , linux-mtd@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The .compatible and .data pairs can be stored in a single line, which makes the code more concise. Signed-off-by: Fabio Estevam --- drivers/mtd/nand/raw/mxc_nand.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index d5c445eb93ad..fd705dd1768d 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1610,22 +1610,11 @@ static inline int is_imx53_nfc(struct mxc_nand_host *host) } static const struct of_device_id mxcnd_dt_ids[] = { - { - .compatible = "fsl,imx21-nand", - .data = &imx21_nand_devtype_data, - }, { - .compatible = "fsl,imx27-nand", - .data = &imx27_nand_devtype_data, - }, { - .compatible = "fsl,imx25-nand", - .data = &imx25_nand_devtype_data, - }, { - .compatible = "fsl,imx51-nand", - .data = &imx51_nand_devtype_data, - }, { - .compatible = "fsl,imx53-nand", - .data = &imx53_nand_devtype_data, - }, + { .compatible = "fsl,imx21-nand", .data = &imx21_nand_devtype_data, }, + { .compatible = "fsl,imx27-nand", .data = &imx27_nand_devtype_data, }, + { .compatible = "fsl,imx25-nand", .data = &imx25_nand_devtype_data, }, + { .compatible = "fsl,imx51-nand", .data = &imx51_nand_devtype_data, }, + { .compatible = "fsl,imx53-nand", .data = &imx53_nand_devtype_data, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mxcnd_dt_ids);