From patchwork Wed Nov 23 11:06:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 83633 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2573746qge; Wed, 23 Nov 2016 03:06:47 -0800 (PST) X-Received: by 10.84.177.129 with SMTP id x1mr5450283plb.105.1479899206996; Wed, 23 Nov 2016 03:06:46 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y27si33238901pfj.161.2016.11.23.03.06.46; Wed, 23 Nov 2016 03:06:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935809AbcKWLGk (ORCPT + 25 others); Wed, 23 Nov 2016 06:06:40 -0500 Received: from mail-wj0-f172.google.com ([209.85.210.172]:33079 "EHLO mail-wj0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935705AbcKWLGh (ORCPT ); Wed, 23 Nov 2016 06:06:37 -0500 Received: by mail-wj0-f172.google.com with SMTP id xy5so7308194wjc.0 for ; Wed, 23 Nov 2016 03:06:36 -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=H2bnQVtu9dWoRhSOGr4oKq9Z9NstY1bdpelO72n/ZV4=; b=VjmWzYCOSeSIfxt9EFUiAoxzr9pO7Njy/Oj6C1p4L6XRlW5kYpGSkKgvwAc17ZzNWs g2YJ37uU8CiFnqysqdrMTHChEZy1lFOA01g7DTlaqftXSgSHzlsrD16zNuyoCFV1Vr01 MMdb1pyqGd2RjEqUUuOf+5YTgkLXXRu9RJsCrWPutLXqCFhKtrmRGf5b2Cu4O5an8xqe G4Q34ZqCU/S4j3M4RQG6qi6iCgdqpOKnAKClRE7bV/tlVZIZ7nx4sh+3GudZ163v7QV4 Rfde78BcS09xJH/VJ/To8VloZScLtG1plv0f/5LoyVmfqnoyeokLLTDjU6aAHoiI0ycu b/fA== 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=H2bnQVtu9dWoRhSOGr4oKq9Z9NstY1bdpelO72n/ZV4=; b=cAxU3/iXUjiAak2P4TpwCp20kv1OvbryzvuciMoON9Z9sagIlfogQaCNRWHfnF/JOy V6jonAgNFINBZUBpqbdWzeKhu5rg4sQo6grOlaWJwnqSOL/RS7sCP+n8S2NvQOyh6hDE g0d+H8Krqln26N9vMGd8aqu8BWIRmXv4cZuJo3Z9eDvWy/9p3m8jmCK/nzNnH4xZufLJ e0Olcuc+s5DN1uLoIy3V2booMhQlqJQ9ysCPBCg2eQvcPHbG0FQeA1D6Fq0VeZ0Nrza1 QWP6Km3MjhEXRWvBRdlw3DjFS4C6NM+kptbAs48wg8BnvLTq3m4Za/wg2frfCe4eL/en QalQ== X-Gm-Message-State: AKaTC00oh1j0X4vlsM0pehn5XAkn3XjBVrj9heoGsVPpW21rqQ9N/J1YG3+qyOuWoB38X1Pv X-Received: by 10.194.100.225 with SMTP id fb1mr2753057wjb.128.1479899196076; Wed, 23 Nov 2016 03:06:36 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id f10sm35746800wjl.28.2016.11.23.03.06.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 03:06:35 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Michael Turquette , Sekhar Nori , Rob Herring , Frank Rowand , Mark Rutland , Peter Ujfalusi , Russell King Cc: LKML , arm-soc , linux-drm , linux-devicetree , Jyri Sarha , Tomi Valkeinen , David Airlie , Laurent Pinchart , Robin Murphy , Sudeep Holla , Bartosz Golaszewski Subject: [PATCH v3 2/3] memory: da8xx-ddrctl: drop the call to of_flat_dt_get_machine_name() Date: Wed, 23 Nov 2016 12:06:26 +0100 Message-Id: <1479899187-10199-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1479899187-10199-1-git-send-email-bgolaszewski@baylibre.com> References: <1479899187-10199-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) -- 2.9.3 diff --git a/drivers/memory/da8xx-ddrctl.c b/drivers/memory/da8xx-ddrctl.c index a20e7bb..1b962ee 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,26 @@ 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_index(root, "compatible", + 0, &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 +137,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; }