Skip to content

Commit

Permalink
Staging: rtl8187se: merge r8180_rtl8225.c with r8180_rtl8225z2.c
Browse files Browse the repository at this point in the history
* merge r8180_rtl8225.c with r8180_rtl8225z2.c
* make functions static
* make tables static const
* remove unused rtl8225_set_gain()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bartlomiej Zolnierkiewicz authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 322f3f2 commit 44a7dcb
Show file tree
Hide file tree
Showing 4 changed files with 272 additions and 307 deletions.
1 change: 0 additions & 1 deletion drivers/staging/rtl8187se/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ rtl8187se-objs := \
r8180_core.o \
r8180_93cx6.o \
r8180_wx.o \
r8180_rtl8225.o \
r8180_rtl8225z2.o \
r8185b_init.o \
r8180_dm.o \
Expand Down
298 changes: 0 additions & 298 deletions drivers/staging/rtl8187se/r8180_rtl8225.c

This file was deleted.

5 changes: 1 addition & 4 deletions drivers/staging/rtl8187se/r8180_rtl8225.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@ void rtl8225z2_rf_init(struct net_device *dev);
void rtl8225z2_rf_set_chan(struct net_device *dev,short ch);
void rtl8225z2_rf_close(struct net_device *dev);

void rtl8225_host_pci_init(struct net_device *dev);

void write_rtl8225(struct net_device *dev, u8 adr, u16 data);
void RF_WriteReg(struct net_device *dev, u8 offset, u32 data);
u32 RF_ReadReg(struct net_device *dev, u8 offset);
void rtl8225_rf_set_chan(struct net_device *dev,short ch);

void rtl8180_set_mode(struct net_device *dev,int mode);
void rtl8180_set_mode(struct net_device *dev,int mode);
bool SetZebraRFPowerState8185(struct net_device *dev,RT_RF_POWER_STATE eRFPowerState);
Expand Down
Loading

0 comments on commit 44a7dcb

Please sign in to comment.