From patchwork Tue Nov 22 12:57:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9441035 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 05CC9600BA for ; Tue, 22 Nov 2016 13:00:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9EE2284C4 for ; Tue, 22 Nov 2016 13:00:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE63628529; Tue, 22 Nov 2016 13:00:34 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9C022284C4 for ; Tue, 22 Nov 2016 13:00:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9Af0-0000Wp-SS; Tue, 22 Nov 2016 12:58:54 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9AeS-0000C8-FT for linux-arm-kernel@lists.infradead.org; Tue, 22 Nov 2016 12:58:22 +0000 Received: by mail-wm0-x22b.google.com with SMTP id g23so23884458wme.1 for ; Tue, 22 Nov 2016 04:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hCMsk1OQwC+9AmCj9vOIow07LnXl/Ol7bDN0S8voMGE=; b=SOoYZE1Nb2AwQLUxhnJo25ED7Jtt10H/yZPLK1x6Bg8hm7sUSOl4B4pyRij05k6QH5 UC7T923MsFm0ZvwdlV2ymCivoS/r+8i8DY0RYL2RIwLkdjPGzJCWe2E64otB5qa0MrBb ZVMC16zZncXT/dgtlzVz5N6Tgoqdb3uWkrnZT2tOlerasSkQagxCLhxLE01ojkVM4lu0 2y1OwcmRZMqVYTR8SJdDlxK1frbOB6YjQV4RlnUlTcr8owwkaW0HrdrfBqPyTjuyRqyY k4XUb2aYidlDhlzV3ULz9FyQVKrfFR9ENg0CJwv9M0Hnz06//nmz9F0xl1UaZiRD9eqi th7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hCMsk1OQwC+9AmCj9vOIow07LnXl/Ol7bDN0S8voMGE=; b=RxF694MjsbSWZy4qAgYw1BajT2F9MvfJjETu56ftxIQb0Fpa+3ZaFzCzCGGrXc8WYF vkJiySiHNjgrg5E9vkNPDwe0vG+1JekKVRWL4xBb486HKTjKGxN8CN6fJGpKKdEy8sbM bjVOhtihDFUFo2Mhckakbv399kEcCN+ekCERTSh4Qxl7vHr8/x7/xy3hq6HTyfP5oNO8 V6lpeKQn2m9Uz+C4G1PAHL4SBBqizh3lYOYMX4qTRW7oESUH2pFIJlO/J9+LyW/VOJ24 YRccnkGOvdyXUZAPgRwBkWWLs4sXGQlyVM0kbGSM6g9l2bfDiEj1uUHCQ/z6QLTMXsDG MAQw== X-Gm-Message-State: AKaTC027FibwGPjcK7b0EvtqXUrLkwiHE1cL73egW7zYw6h0VfD89XhVC2Y+Sy9ubhNiPE4v X-Received: by 10.194.85.77 with SMTP id f13mr13990375wjz.187.1479819477970; Tue, 22 Nov 2016 04:57:57 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id t82sm2849453wmd.17.2016.11.22.04.57.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Nov 2016 04:57:57 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Michael Turquette , Sekhar Nori , Rob Herring , Frank Rowand , Mark Rutland , Peter Ujfalusi , Russell King Subject: [PATCH v2 2/2] memory: da8xx-ddrctl: drop the call to of_flat_dt_get_machine_name() Date: Tue, 22 Nov 2016 13:57:48 +0100 Message-Id: <1479819468-4016-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1479819468-4016-1-git-send-email-bgolaszewski@baylibre.com> References: <1479819468-4016-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161122_045820_871001_CBEF5776 X-CRM114-Status: GOOD ( 15.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-devicetree , David Airlie , LKML , linux-drm , Bartosz Golaszewski , Tomi Valkeinen , Jyri Sarha , Sudeep Holla , Robin Murphy , arm-soc , Laurent Pinchart MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In order to avoid a section mismatch use a locally implemented routine instead of of_flat_dt_get_machine_name() when printing the error message. Signed-off-by: Bartosz Golaszewski --- drivers/memory/da8xx-ddrctl.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/memory/da8xx-ddrctl.c b/drivers/memory/da8xx-ddrctl.c index a20e7bb..ee0c266 100644 --- a/drivers/memory/da8xx-ddrctl.c +++ b/drivers/memory/da8xx-ddrctl.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -71,6 +70,25 @@ static const struct da8xx_ddrctl_board_settings da8xx_ddrctl_board_confs[] = { }, }; +/* + * FIXME Remove this function once of/base gets a general routine for getting + * the machine model/compatible string. + */ +static const char *da8xx_ddrctl_machine_get_compatible(void) +{ + struct device_node *root; + const char *compatible; + int ret = -1; + + root = of_find_node_by_path("/"); + if (root) { + ret = of_property_read_string(root, "compatible", &compatible); + of_node_put(root); + } + + return ret ? NULL : compatible; +} + static const struct da8xx_ddrctl_config_knob * da8xx_ddrctl_match_knob(const struct da8xx_ddrctl_setting *setting) { @@ -118,7 +136,7 @@ static int da8xx_ddrctl_probe(struct platform_device *pdev) setting = da8xx_ddrctl_get_board_settings(); if (!setting) { dev_err(dev, "no settings for board '%s'\n", - of_flat_dt_get_machine_name()); + da8xx_ddrctl_machine_get_compatible()); return -EINVAL; }