From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757412Ab0BQO6c (ORCPT ); Wed, 17 Feb 2010 09:58:32 -0500 Received: from karen.lavabit.com ([72.249.41.33]:45695 "EHLO karen.lavabit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757373Ab0BQO6b (ORCPT ); Wed, 17 Feb 2010 09:58:31 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=T1OBQfOXV9XPyEJ8zSfTfFWSDb76ru4RrZZOg2qZ5lc8MbDkJ7HRB5FOIsD1c610BOzzUTgOBvVcx7/H73URwo5h2JHABzx0aPrQfUN+gK8bMKHHFU+KFwVBcQYSKcefgZpxkYFsDSrJ3XD1LRzm3N3glLnkjWJpOfShLBfyOb8=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Content-Transfer-Encoding; Message-ID: <4B7C0406.9040400@lavabit.com> Date: Wed, 17 Feb 2010 14:58:14 +0000 From: Richard Colquhoun User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Greg Kroah-Hartman CC: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] Staging: rtl8187se: fix spacing errors and commenting format in r8180_93cx6.c Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 764502ee11ccd601ee7fb6bc00e2333055b9dd41 Mon Sep 17 00:00:00 2001 From: Richard Colquhoun Date: Wed, 17 Feb 2010 12:32:13 +0000 Subject: [PATCH] Staging: rtl8187se: fix spacing errors and commenting format in r8180_93cx6.c This patch just fixes all of the errors highlighted by the checkpatch.pl script Signed-off-by: Richard Colquhoun --- drivers/staging/rtl8187se/r8180_93cx6.c | 81 ++++++++++++++++--------------- 1 files changed, 41 insertions(+), 40 deletions(-) diff --git a/drivers/staging/rtl8187se/r8180_93cx6.c b/drivers/staging/rtl8187se/r8180_93cx6.c index 7e4711f..51c59cb 100644 --- a/drivers/staging/rtl8187se/r8180_93cx6.c +++ b/drivers/staging/rtl8187se/r8180_93cx6.c @@ -22,13 +22,13 @@ void eprom_cs(struct net_device *dev, short bit) { - if(bit) + if (bit) write_nic_byte(dev, EPROM_CMD, (1<epromtype==EPROM_93c56){ - addr_str[7]=addr & 1; - addr_str[6]=addr & (1<<1); - addr_str[5]=addr & (1<<2); - addr_str[4]=addr & (1<<3); - addr_str[3]=addr & (1<<4); - addr_str[2]=addr & (1<<5); - addr_str[1]=addr & (1<<6); - addr_str[0]=addr & (1<<7); - addr_len=8; - }else{ - addr_str[5]=addr & 1; - addr_str[4]=addr & (1<<1); - addr_str[3]=addr & (1<<2); - addr_str[2]=addr & (1<<3); - addr_str[1]=addr & (1<<4); - addr_str[0]=addr & (1<<5); - addr_len=6; + if (priv->epromtype == EPROM_93c56) { + addr_str[7] = addr & 1; + addr_str[6] = addr & (1<<1); + addr_str[5] = addr & (1<<2); + addr_str[4] = addr & (1<<3); + addr_str[3] = addr & (1<<4); + addr_str[2] = addr & (1<<5); + addr_str[1] = addr & (1<<6); + addr_str[0] = addr & (1<<7); + addr_len = 8; + } else{ + addr_str[5] = addr & 1; + addr_str[4] = addr & (1<<1); + addr_str[3] = addr & (1<<2); + addr_str[2] = addr & (1<<3); + addr_str[1] = addr & (1<<4); + addr_str[0] = addr & (1<<5); + addr_len = 6; } eprom_cs(dev, 1); eprom_ck_cycle(dev); eprom_send_bits_string(dev, read_cmd, 3); eprom_send_bits_string(dev, addr_str, addr_len); - //keep chip pin D to low state while reading. - //I'm unsure if it is necessary, but anyway shouldn't hurt + #keep chip pin D to low state while reading. + #I'm unsure if it is necessary, but anyway shouldn't hurt eprom_w(dev, 0); - for(i=0;i<16;i++){ - //eeprom needs a clk cycle between writing opcode&adr - //and reading data. (eeprom outs a dummy 0) + for (i = 0; i < 16; i++) { + #eeprom needs a clk cycle between writing opcode&adr + #and reading data. (eeprom outs a dummy 0) eprom_ck_cycle(dev); ret |= (eprom_r(dev)<<(15-i)); } @@ -139,7 +140,7 @@ u32 eprom_read(struct net_device *dev, u32 addr) eprom_cs(dev, 0); eprom_ck_cycle(dev); - //disable EPROM programming + #disable EPROM programming write_nic_byte(dev, EPROM_CMD, (EPROM_CMD_NORMAL<