Merge branch 'master' of git://git.denx.de/u-boot-i2c

[u-boot] / board / renesas / sh7785lcr / rtl8169_mac.c

diff --git a/board/renesas/sh7785lcr/rtl8169_mac.c b/board/renesas/sh7785lcr/rtl8169_mac.c
index dae01ec773513f77a748535a68a525a95e4ac9b8..c91ebdc5435161c6964b2ee71592ae5cc4ad860a 100644 (file)
--- a/board/renesas/sh7785lcr/rtl8169_mac.c
+++ b/board/renesas/sh7785lcr/rtl8169_mac.c
@@ -1,20 +1,7 @@
 /*
  * Copyright (C) 2008 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
  *
- * 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+
  */
 
 #include <common.h>
@@ -304,10 +291,8 @@ int do_set_mac(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        unsigned char mac[6];
        char *s, *e;
 
-       if (argc != 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 2)
+               return cmd_usage(cmdtp);
 
        s = argv[1];
 
@@ -330,10 +315,8 @@ U_BOOT_CMD(
 
 int do_print_mac(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       if (argc != 1) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 1)
+               return cmd_usage(cmdtp);
 
        mac_read();