lkml.org 
[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/28] staging: ft1000-pcmcia: get rid of ft1000_dev.h
    Date
    Shorten ft1000_read_reg() to single line and move it to ft1000.h along with
    ft1000_write_reg() and delete ft1000_dev.h

    Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
    ---
    drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 10 +++
    drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 66 --------------------
    drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 1 -
    drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 1 -
    4 files changed, 10 insertions(+), 68 deletions(-)
    delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h

    diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
    index 61e1cfc..fab92ad 100644
    --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
    +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
    @@ -406,4 +406,14 @@ extern u16 ft1000_read_dpram_mag_16 (struct net_device *dev, int offset, int Ind
    extern u32 ft1000_read_dpram_mag_32 (struct net_device *dev, int offset);
    void ft1000_write_dpram_mag_32 (struct net_device *dev, int offset, u32 value);

    +/* Read the value of a given ASIC register. */
    +static inline u16 ft1000_read_reg (struct net_device *dev, u16 offset) {
    + return inw(dev->base_addr + offset);
    +}
    +
    +/* Set the value of a given ASIC register. */
    +static inline void ft1000_write_reg (struct net_device *dev, u16 offset, u16 value) {
    + outw(value, dev->base_addr + offset);
    +}
    +
    #endif // _FT1000H_
    diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h
    deleted file mode 100644
    index 0b63f05..0000000
    --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h
    +++ /dev/null
    @@ -1,66 +0,0 @@
    -//---------------------------------------------------------------------------
    -// FT1000 driver for Flarion Flash OFDM NIC Device
    -//
    -// Copyright (C) 2002 Flarion Technologies, All rights reserved.
    -//
    -// This program is free software; you can redistribute it and/or modify it
    -// under the terms of the GNU General Public License as published by the Free
    -// Software Foundation; either version 2 of the License, or (at your option) any
    -// later version. This program is distributed in the hope that it will be useful,
    -// but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
    -// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    -// more details. You should have received a copy of the GNU General Public
    -// License along with this program; if not, write to the
    -// Free Software Foundation, Inc., 59 Temple Place -
    -// Suite 330, Boston, MA 02111-1307, USA.
    -//---------------------------------------------------------------------------
    -//
    -// File: ft1000_dev.h
    -//
    -// Description: Register definitions and bit masks for the FT1000 NIC
    -//
    -// History:
    -// 2/5/02 Ivan Bohannon Written.
    -// 8/29/02 Whc Ported to Linux.
    -//
    -//---------------------------------------------------------------------------
    -#ifndef _FT1000_DEVH_
    -#define _FT1000_DEVH_
    -
    -//---------------------------------------------------------------------------
    -//
    -// Function: ft1000_read_reg
    -// Description: This function will read the value of a given ASIC register.
    -// Input:
    -// dev - device structure
    -// offset - ASIC register offset
    -// Output:
    -// data - ASIC register value
    -//
    -//---------------------------------------------------------------------------
    -static inline u16 ft1000_read_reg (struct net_device *dev, u16 offset) {
    - u16 data = 0;
    -
    - data = inw(dev->base_addr + offset);
    -
    - return (data);
    -}
    -
    -//---------------------------------------------------------------------------
    -//
    -// Function: ft1000_write_reg
    -// Description: This function will set the value for a given ASIC register.
    -// Input:
    -// dev - device structure
    -// offset - ASIC register offset
    -// value - value to write
    -// Output:
    -// None.
    -//
    -//---------------------------------------------------------------------------
    -static inline void ft1000_write_reg (struct net_device *dev, u16 offset, u16 value) {
    - outw (value, dev->base_addr + offset);
    -}
    -
    -#endif // _FT1000_DEVH_
    -
    diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
    index fb375ea..c49180a 100644
    --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
    +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
    @@ -34,7 +34,6 @@
    #include <asm/uaccess.h>
    #include <linux/vmalloc.h>

    -#include "ft1000_dev.h"
    #include "ft1000.h"
    #include "boot.h"

    diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
    index 830822f..d60ec7c 100644
    --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
    @@ -54,7 +54,6 @@
    #endif

    #include <linux/delay.h>
    -#include "ft1000_dev.h"
    #include "ft1000.h"

    int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength);
    --
    Ondrej Zary


    \
     
     \ /
      Last update: 2011-07-01 00:09    [W:0.029 / U:0.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site