[PATCH 1/2] net: designware: add missing headers

[PATCH 1/2] net: designware: add missing headers

[Lucas Stach]

As the eth_device and mii_bus structs are allocated inside the
dw_eth_dev struct a forward declaration isn't enough.

Fixes: c1f902841ce3 (net: designware: move probe to generic driver)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/net/designware.h         | 3 +--
 drivers/net/designware_generic.c | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/designware.h b/drivers/net/designware.h
index c9dc27a59474..4a99fa2aa60b 100644
--- a/drivers/net/designware.h
+++ b/drivers/net/designware.h
@@ -20,8 +20,7 @@
 #ifndef __DESIGNWARE_ETH_H
 #define __DESIGNWARE_ETH_H
 
-struct eth_device;
-struct mii_bus;
+#include <net.h>
 
 struct dw_eth_dev {
 	struct eth_device netdev;
diff --git a/drivers/net/designware_generic.c b/drivers/net/designware_generic.c
index 0e5b9c067b6b..29269deac9e9 100644
--- a/drivers/net/designware_generic.c
+++ b/drivers/net/designware_generic.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include "designware.h"
 
 static struct dw_eth_drvdata dwmac_370a_drvdata = {
-- 
2.15.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] reset: add missing stub for reset_control_get

[Lucas Stach]

Fixes: 45b95b50cd0b (reset: add reset controller framework)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/linux/reset.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/linux/reset.h b/include/linux/reset.h
index be0d1bb5a621..a22bcf9a5d64 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -37,6 +37,13 @@ static inline int reset_control_deassert(struct reset_control *rstc)
 	return 0;
 }
 
+static inline struct reset_control *
+reset_control_get(struct device_d *dev, const char *id)
+{
+	WARN_ON(1);
+	return NULL;
+}
+
 static inline void reset_control_put(struct reset_control *rstc)
 {
 	WARN_ON(1);
-- 
2.15.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] net: designware: add missing headers

[Sascha Hauer]

On Tue, Jan 30, 2018 at 04:40:12PM +0100, Lucas Stach wrote:
> As the eth_device and mii_bus structs are allocated inside the
> dw_eth_dev struct a forward declaration isn't enough.
> 
> Fixes: c1f902841ce3 (net: designware: move probe to generic driver)
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/net/designware.h         | 3 +--
>  drivers/net/designware_generic.c | 1 +
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/net/designware.h b/drivers/net/designware.h
> index c9dc27a59474..4a99fa2aa60b 100644
> --- a/drivers/net/designware.h
> +++ b/drivers/net/designware.h
> @@ -20,8 +20,7 @@
>  #ifndef __DESIGNWARE_ETH_H
>  #define __DESIGNWARE_ETH_H
>  
> -struct eth_device;
> -struct mii_bus;
> +#include <net.h>
>  
>  struct dw_eth_dev {
>  	struct eth_device netdev;
> diff --git a/drivers/net/designware_generic.c b/drivers/net/designware_generic.c
> index 0e5b9c067b6b..29269deac9e9 100644
> --- a/drivers/net/designware_generic.c
> +++ b/drivers/net/designware_generic.c
> @@ -22,6 +22,7 @@
>   */
>  
>  #include <common.h>
> +#include <init.h>
>  #include "designware.h"
>  
>  static struct dw_eth_drvdata dwmac_370a_drvdata = {
> -- 
> 2.15.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox