projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spl: spl_legacy: Use IS_ENABLED() to remove #ifdef
[oweals/u-boot.git]
/
api
/
api_net.c
diff --git
a/api/api_net.c
b/api/api_net.c
index 7b3805e8fdbec822a38739074d107857112d86ee..7515c26e8b44edd3a4cc2e8184776cc97a4612c5 100644
(file)
--- a/
api/api_net.c
+++ b/
api/api_net.c
@@
-1,9
+1,8
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <config.h>
*/
#include <config.h>
@@
-12,8
+11,6
@@
#include <linux/types.h>
#include <api_public.h>
#include <linux/types.h>
#include <api_public.h>
-DECLARE_GLOBAL_DATA_PTR;
-
#define DEBUG
#undef DEBUG
#define DEBUG
#undef DEBUG
@@
-25,7
+22,7
@@
DECLARE_GLOBAL_DATA_PTR;
#define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
#define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
-#if
def CONFIG_CMD_NET
+#if
defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
static int dev_valid_net(void *cookie)
{
static int dev_valid_net(void *cookie)
{
@@
-37,7
+34,7
@@
int dev_open_net(void *cookie)
if (!dev_valid_net(cookie))
return API_ENODEV;
if (!dev_valid_net(cookie))
return API_ENODEV;
- if (eth_init(
gd->bd
) < 0)
+ if (eth_init() < 0)
return API_EIO;
return 0;
return API_EIO;
return 0;