From patchwork Sat Dec 14 05:53:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 3345981 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A42EE9F243 for ; Sat, 14 Dec 2013 06:23:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF1BB20783 for ; Sat, 14 Dec 2013 06:23:57 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by mail.kernel.org (Postfix) with ESMTP id 2227820781 for ; Sat, 14 Dec 2013 06:23:57 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [IPv6:::1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 48655B76; Sat, 14 Dec 2013 06:23:12 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTP id A7CC5909 for ; Sat, 14 Dec 2013 06:23:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) by smtp2.linuxfoundation.org (Postfix) with ESMTP id E4F8E1DDC4 for ; Sat, 14 Dec 2013 06:23:04 +0000 (UTC) Received: from penelope.isobedori.kobe.vergenet.net (g1-27-253-251-111.bmobile.ne.jp [27.253.251.111]) by kirsty.vergenet.net (Postfix) with ESMTP id A891A26721F; Sat, 14 Dec 2013 17:00:36 +1100 (EST) Received: by penelope.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 741CD7C03D8; Sat, 14 Dec 2013 14:53:57 +0900 (JST) From: Simon Horman To: ltsi-dev@lists.linuxfoundation.org Date: Sat, 14 Dec 2013 14:53:09 +0900 Message-Id: <1387000406-29111-221-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1387000406-29111-1-git-send-email-horms+renesas@verge.net.au> References: <1387000406-29111-1-git-send-email-horms+renesas@verge.net.au> X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Cc: Magnus Damm Subject: [LTSI-dev] [PATCH 220/237] spi: use dev_get_platdata() X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jingoo Han Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han Signed-off-by: Mark Brown (cherry picked from commit 8074cf063e410a2c0cf1704c3b31002e21f5df7c) Signed-off-by: Simon Horman Conflicts: drivers/spi/spi-altera.c drivers/spi/spi-ath79.c drivers/spi/spi-au1550.c drivers/spi/spi-bcm63xx.c drivers/spi/spi-bfin-sport.c drivers/spi/spi-bfin-v3.c drivers/spi/spi-bfin5xx.c drivers/spi/spi-coldfire-qspi.c drivers/spi/spi-davinci.c drivers/spi/spi-ep93xx.c drivers/spi/spi-fsl-espi.c drivers/spi/spi-fsl-lib.c drivers/spi/spi-fsl-spi.c drivers/spi/spi-gpio.c drivers/spi/spi-mpc512x-psc.c drivers/spi/spi-mpc52xx-psc.c drivers/spi/spi-nuc900.c drivers/spi/spi-oc-tiny.c drivers/spi/spi-omap-100k.c drivers/spi/spi-omap2-mcspi.c drivers/spi/spi-pl022.c drivers/spi/spi-rspi.c drivers/spi/spi-s3c24xx.c drivers/spi/spi-s3c64xx.c drivers/spi/spi-sh-sci.c drivers/spi/spi-ti-ssp.c drivers/spi/spi-tle62x0.c drivers/spi/spi-xilinx.c --- drivers/spi/spi-sh-msiof.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 6688ce7..2a95435 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -645,7 +645,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) if (pdev->dev.of_node) p->info = sh_msiof_spi_parse_dt(&pdev->dev); else - p->info = pdev->dev.platform_data; + p->info = dev_get_platdata(&pdev->dev); if (!p->info) { dev_err(&pdev->dev, "failed to obtain device info\n");