From patchwork Mon Apr 8 13:48:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 234783 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3F1822C00D1 for ; Mon, 8 Apr 2013 23:49:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936053Ab3DHNs7 (ORCPT ); Mon, 8 Apr 2013 09:48:59 -0400 Received: from mail-ea0-f178.google.com ([209.85.215.178]:40644 "EHLO mail-ea0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935940Ab3DHNs6 (ORCPT ); Mon, 8 Apr 2013 09:48:58 -0400 Received: by mail-ea0-f178.google.com with SMTP id o10so2358119eaj.23 for ; Mon, 08 Apr 2013 06:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:subject:from:to:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=oHBlj+PHsIRIvNmNg3B0G3+A7Gcs/vVsdgJYwh8eWTU=; b=LUYRXWdwozCPTCaz4lGcoMjB/sW9inNrRHzthwKXmUi/kiFtyycpge/vnobQ+uW3qP pp9Vx6wPt3BJhYzfPzY5G85FeRO0piITgr4BWU+jfGtiiNzFz5QDJnQfPPQA/eq79d1W nN/9A+ihFBp098yyj31HBJBSdf3rAJBQjec3oQ3CyR9uaZasFkk2nxnAbjXXKTLKpJsy 7/U7KpeM/Y5PCa5vvhFOWD8M13xN8CfZQBJk+pcrypOkllqmo9nFc/6+q78yRsRzyV35 sFxleSf3CSDgmwKbal7POI7VYKDjfzvPtoOpfE1rD560bugI4Ih7Z/qw9vcfTrD5i+sB /oCw== X-Received: by 10.15.101.200 with SMTP id bp48mr48767283eeb.38.1365428936612; Mon, 08 Apr 2013 06:48:56 -0700 (PDT) Received: from [127.0.0.1] (fritzc.com. [78.47.220.26]) by mx.google.com with ESMTPS id ca4sm32144868eeb.15.2013.04.08.06.48.54 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 06:48:55 -0700 (PDT) Subject: [PATCH] can: sja1000: use cpu endian From: Christoph Fritz To: Wolfgang Grandegger , Marc Kleine-Budde , Grant Likely , Rob Herring , Bill Pemberton , Andreas Larsson , linux-can@vger.kernel.org, "netdev@vger.kernel.org" , "Hans J. Koch" , Daniel Mack Date: Mon, 08 Apr 2013 15:48:52 +0200 Message-ID: <1365428932.5760.52.camel@lovely> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Christoph Fritz --- drivers/net/can/sja1000/sja1000_of_platform.c | 26 ++++++++++++------------ 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index 6433b81..83a13d2 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c @@ -97,7 +97,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) struct sja1000_priv *priv; struct resource res; const u32 *prop; - int err, irq, res_size, prop_size; + int err, irq, res_size; void __iomem *base; err = of_address_to_resource(np, 0, &res); @@ -138,27 +138,27 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->read_reg = sja1000_ofp_read_reg; priv->write_reg = sja1000_ofp_write_reg; - prop = of_get_property(np, "nxp,external-clock-frequency", &prop_size); - if (prop && (prop_size == sizeof(u32))) - priv->can.clock.freq = *prop / 2; + prop = of_get_property(np, "nxp,external-clock-frequency", NULL); + if (prop) + priv->can.clock.freq = be32_to_cpup(prop) / 2; else priv->can.clock.freq = SJA1000_OFP_CAN_CLOCK; /* default */ - prop = of_get_property(np, "nxp,tx-output-mode", &prop_size); - if (prop && (prop_size == sizeof(u32))) - priv->ocr |= *prop & OCR_MODE_MASK; + prop = of_get_property(np, "nxp,tx-output-mode", NULL); + if (prop) + priv->ocr |= be32_to_cpup(prop) & OCR_MODE_MASK; else priv->ocr |= OCR_MODE_NORMAL; /* default */ - prop = of_get_property(np, "nxp,tx-output-config", &prop_size); - if (prop && (prop_size == sizeof(u32))) - priv->ocr |= (*prop << OCR_TX_SHIFT) & OCR_TX_MASK; + prop = of_get_property(np, "nxp,tx-output-config", NULL); + if (prop) + priv->ocr |= (be32_to_cpup(prop) << OCR_TX_SHIFT) & OCR_TX_MASK; else priv->ocr |= OCR_TX0_PULLDOWN; /* default */ - prop = of_get_property(np, "nxp,clock-out-frequency", &prop_size); - if (prop && (prop_size == sizeof(u32)) && *prop) { - u32 divider = priv->can.clock.freq * 2 / *prop; + prop = of_get_property(np, "nxp,clock-out-frequency", NULL); + if (prop) { + u32 divider = priv->can.clock.freq * 2 / be32_to_cpup(prop); if (divider > 1) priv->cdr |= divider / 2 - 1;