From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> Cc: festevam@gmail.com, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, netdev@vger.kernel.org, Jaccon Bastiaansen To: s.hauer@pengutronix.de, gfm@funxed.com, davem@davemloft.net, arnd@arndb.de Return-path: 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) Sender: netdev-owner@vger.kernel.org List-ID: 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) -- 1.7.1