| Message ID | 1332891772-17279-3-git-send-email-joe.hershberger@ni.com |
|---|---|
| State | Accepted |
| Commit | bb901574922dcf9c97c33bc04fba3ba539397527 |
| Delegated to: | Joe Hershberger |
| Headers | show |
On Tue, Mar 27, 2012 at 4:42 PM, Joe Hershberger <joe.hershberger@ni.com> wrote: > Some copy/pasted drivers redefine functions > defined in include/net.h. Remove these so that > the definitions can be changed without error. > > Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> > Cc: Joe Hershberger <joe.hershberger@gmail.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Simon Glass <sjg@chromium.org> (I assume MAKEALL throws no errors due to these) > --- > Changes for v2: > - Split from "Remove volatile from all of net except the eth driver interface" > > board/Marvell/db64360/mv_eth.c | 2 -- > board/Marvell/db64460/mv_eth.c | 2 -- > board/esd/cpci750/mv_eth.c | 2 -- > board/prodrive/p3mx/mv_eth.c | 2 -- > 4 files changed, 0 insertions(+), 8 deletions(-) > > diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c > index e89ea43..1841355 100644 > --- a/board/Marvell/db64360/mv_eth.c > +++ b/board/Marvell/db64360/mv_eth.c > @@ -95,8 +95,6 @@ int mv64360_eth_xmit (struct eth_device *, volatile void *packet, int length); > #ifndef UPDATE_STATS_BY_SOFTWARE > static void mv64360_eth_print_stat (struct eth_device *dev); > #endif > -/* Processes a received packet */ > -extern void NetReceive (volatile uchar *, int); > > extern unsigned int INTERNAL_REG_BASE_ADDR; > > diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c > index a763d79..da48fa8 100644 > --- a/board/Marvell/db64460/mv_eth.c > +++ b/board/Marvell/db64460/mv_eth.c > @@ -95,8 +95,6 @@ int mv64460_eth_xmit (struct eth_device *, volatile void *packet, int length); > #ifndef UPDATE_STATS_BY_SOFTWARE > static void mv64460_eth_print_stat (struct eth_device *dev); > #endif > -/* Processes a received packet */ > -extern void NetReceive (volatile uchar *, int); > > extern unsigned int INTERNAL_REG_BASE_ADDR; > > diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c > index a3bde81..9cccbdb 100644 > --- a/board/esd/cpci750/mv_eth.c > +++ b/board/esd/cpci750/mv_eth.c > @@ -95,8 +95,6 @@ int mv64360_eth_xmit (struct eth_device *, volatile void *packet, int length); > #ifndef UPDATE_STATS_BY_SOFTWARE > static void mv64360_eth_print_stat (struct eth_device *dev); > #endif > -/* Processes a received packet */ > -extern void NetReceive (volatile uchar *, int); > > extern unsigned int INTERNAL_REG_BASE_ADDR; > > diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c > index 9e3213b..976cb0b 100644 > --- a/board/prodrive/p3mx/mv_eth.c > +++ b/board/prodrive/p3mx/mv_eth.c > @@ -109,8 +109,6 @@ int phy_setup_aneg (char *devname, unsigned char addr); > #ifndef UPDATE_STATS_BY_SOFTWARE > static void mv64460_eth_print_stat (struct eth_device *dev); > #endif > -/* Processes a received packet */ > -extern void NetReceive (volatile uchar *, int); > > extern unsigned int INTERNAL_REG_BASE_ADDR; > > -- > 1.6.0.2 >
diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c index e89ea43..1841355 100644 --- a/board/Marvell/db64360/mv_eth.c +++ b/board/Marvell/db64360/mv_eth.c @@ -95,8 +95,6 @@ int mv64360_eth_xmit (struct eth_device *, volatile void *packet, int length); #ifndef UPDATE_STATS_BY_SOFTWARE static void mv64360_eth_print_stat (struct eth_device *dev); #endif -/* Processes a received packet */ -extern void NetReceive (volatile uchar *, int); extern unsigned int INTERNAL_REG_BASE_ADDR; diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c index a763d79..da48fa8 100644 --- a/board/Marvell/db64460/mv_eth.c +++ b/board/Marvell/db64460/mv_eth.c @@ -95,8 +95,6 @@ int mv64460_eth_xmit (struct eth_device *, volatile void *packet, int length); #ifndef UPDATE_STATS_BY_SOFTWARE static void mv64460_eth_print_stat (struct eth_device *dev); #endif -/* Processes a received packet */ -extern void NetReceive (volatile uchar *, int); extern unsigned int INTERNAL_REG_BASE_ADDR; diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c index a3bde81..9cccbdb 100644 --- a/board/esd/cpci750/mv_eth.c +++ b/board/esd/cpci750/mv_eth.c @@ -95,8 +95,6 @@ int mv64360_eth_xmit (struct eth_device *, volatile void *packet, int length); #ifndef UPDATE_STATS_BY_SOFTWARE static void mv64360_eth_print_stat (struct eth_device *dev); #endif -/* Processes a received packet */ -extern void NetReceive (volatile uchar *, int); extern unsigned int INTERNAL_REG_BASE_ADDR; diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c index 9e3213b..976cb0b 100644 --- a/board/prodrive/p3mx/mv_eth.c +++ b/board/prodrive/p3mx/mv_eth.c @@ -109,8 +109,6 @@ int phy_setup_aneg (char *devname, unsigned char addr); #ifndef UPDATE_STATS_BY_SOFTWARE static void mv64460_eth_print_stat (struct eth_device *dev); #endif -/* Processes a received packet */ -extern void NetReceive (volatile uchar *, int); extern unsigned int INTERNAL_REG_BASE_ADDR;
Some copy/pasted drivers redefine functions defined in include/net.h. Remove these so that the definitions can be changed without error. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org> --- Changes for v2: - Split from "Remove volatile from all of net except the eth driver interface" board/Marvell/db64360/mv_eth.c | 2 -- board/Marvell/db64460/mv_eth.c | 2 -- board/esd/cpci750/mv_eth.c | 2 -- board/prodrive/p3mx/mv_eth.c | 2 -- 4 files changed, 0 insertions(+), 8 deletions(-)