Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac29985 authored by Ondrej Zary's avatar Ondrej Zary Committed by Greg Kroah-Hartman
Browse files

staging: ft1000-pcmcia: get rid of ft1000_dev.h 



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: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f1fb1904

drivers/staging/ft1000/ft1000-pcmcia/ft1000.h

+10 −0
Original line number Diff line number Diff line
@@ -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_

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
//---------------------------------------------------------------------------

// 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_

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <asm/uaccess.h>

#include <linux/vmalloc.h>



#include "ft1000_dev.h"

#include "ft1000.h"

#include "boot.h"

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c

+0 −1
Original line number Diff line number Diff line
@@ -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);