Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / drivers / net / smc91111.c

diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 5cfef4dd7b463f13d0bc956078fdabddfae14368..57c667a58a8dc0e338779e9e8cc75b8e4640c384 100644 (file)
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -10,19 +10,7 @@
  .      Developed by Simple Network Magic Corporation (SNMC)
  . Copyright (C) 1996 by Erik Stahlman (ES)
  .
- . 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
+ * SPDX-License-Identifier:    GPL-2.0+
  .
  . Information contained in this file was obtained from the LAN91C111
  . manual from SMC.  To get a copy, if you really want one, you can find
@@ -178,8 +166,6 @@ static void smc_phy_configure(struct eth_device *dev);
  * inx,outx functions fixed this problem.
  */
 
-#define barrier() __asm__ __volatile__("": : :"memory")
-
 static inline word SMC_inw(struct eth_device *dev, dword offset)
 {
        word v;
@@ -426,8 +412,7 @@ static void smc_halt(struct eth_device *dev)
  .     Enable the transmit interrupt, so I know if it failed
  .     Free the kernel data if I actually sent it.
 */
-static int smc_send(struct eth_device *dev, volatile void *packet,
-       int packet_length)
+static int smc_send(struct eth_device *dev, void *packet, int packet_length)
 {
        byte packet_no;
        byte *buf;