From patchwork Mon Apr 30 09:57:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaccon Bastiaansen X-Patchwork-Id: 155825 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 9F656B6F6E for ; Mon, 30 Apr 2012 19:57:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756024Ab2D3J5u (ORCPT ); Mon, 30 Apr 2012 05:57:50 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:53474 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755362Ab2D3J5t (ORCPT ); Mon, 30 Apr 2012 05:57:49 -0400 Received: by eaaq12 with SMTP id q12so631024eaa.19 for ; Mon, 30 Apr 2012 02:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=PjKfHwqQsWRCVCJykMSGK1BuVPNOGEeHQwZlNmWA4ns=; b=HWgFqMW0RxK4tZSUeMZ1T7KF1zt/JgdoXisRnLDwPtg7z/slA9asIEd4zEEH3D1noF x6CmXzMVunz1Hchkh5nacEzVLet5ZPwO9hrg9mHwb7/rk2A5Ml5kRTzLC1+Df7z6l/dB lK/8XVJOwQUsq4IartvW64EXepTYb3i6GqrvgLt6w4Dk+DHDWtiWAH+1GH+8uIFh3ahk 2/adR/aEOIrI3DwTNYA0gBnTQ2+Fl66HDdWnN25svgNaiLDT/Td2PJmhTMa6iabx7EBu /9gmelyTkX8/foqhiA0yay/Q8g/mba3tN6vJI6c/VzX0BuyGposzVcbRxVIs9bvULKUu VcjA== Received: by 10.213.2.134 with SMTP id 6mr130177ebj.241.1335779868477; Mon, 30 Apr 2012 02:57:48 -0700 (PDT) Received: from localhost.localdomain (s529d540e.adsl.wanadoo.nl. [82.157.84.14]) by mx.google.com with ESMTPS id x4sm72366043eef.10.2012.04.30.02.57.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Apr 2012 02:57:47 -0700 (PDT) From: Jaccon Bastiaansen To: s.hauer@pengutronix.de, gfm@funxed.com, davem@davemloft.net, arnd@arndb.de Cc: festevam@gmail.com, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, netdev@vger.kernel.org, Jaccon Bastiaansen Subject: [PATCH 1/2] cs89x0_platform : Use ioread16/iowrite16 instead of inw/outw Date: Mon, 30 Apr 2012 11:57:19 +0200 Message-Id: <1335779839-30420-1-git-send-email-jaccon.bastiaansen@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The use of the inw/outw functions by the cs89x0 platform driver results in NULL pointer references. Signed-off-by: Jaccon Bastiaansen --- drivers/net/ethernet/cirrus/cs89x0.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index b9406cb..95737e9 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c @@ -369,6 +369,18 @@ writeword(unsigned long base_addr, int portno, u16 value) { __raw_writel(value, base_addr + (portno << 1)); } +#elif defined(CONFIG_CS89x0_PLATFORM) +static u16 +readword(unsigned long base_addr, int portno) +{ + return ioread16(base_addr + portno); +} + +static void +writeword(unsigned long base_addr, int portno, u16 value) +{ + iowrite16(value, base_addr + portno); +} #else static u16 readword(unsigned long base_addr, int portno)