Message ID | 1429883310-22441-13-git-send-email-hdegoede@redhat.com |
---|---|
State | Accepted |
Delegated to: | Hans de Goede |
Headers | show |
On 24 April 2015 at 07:48, Hans de Goede <hdegoede@redhat.com> wrote: > netdev.h should not be included in device-model enabled builds (doing so > causes compiler warnings about struct eth_device not being declared), but > we do use sunxi_gmac_initialize in the device-model case, so move it out of > netdev.h . > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > arch/arm/include/asm/arch-sunxi/sys_proto.h | 3 +++ > include/netdev.h | 1 - > 2 files changed, 3 insertions(+), 1 deletion(-) > Reviewed-by: Simon Glass <sjg@chromium.org> > diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h > index 60a5bd8..9df3744 100644 > --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h > +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h > @@ -23,4 +23,7 @@ void sdelay(unsigned long); > */ > void return_to_fel(uint32_t lr, uint32_t sp); > > +/* Board / SoC level designware gmac init */ > +int sunxi_gmac_initialize(bd_t *bis); > + > #endif > diff --git a/include/netdev.h b/include/netdev.h > index d96e1da..e6bdfdf 100644 > --- a/include/netdev.h > +++ b/include/netdev.h > @@ -81,7 +81,6 @@ int skge_initialize(bd_t *bis); > int smc91111_initialize(u8 dev_num, int base_addr); > int smc911x_initialize(u8 dev_num, int base_addr); > int sunxi_emac_initialize(bd_t *bis); > -int sunxi_gmac_initialize(bd_t *bis); > int tsi108_eth_initialize(bd_t *bis); > int uec_standard_init(bd_t *bis); > int uli526x_initialize(bd_t *bis); > -- > 2.3.5 >
On Fri, 2015-04-24 at 15:48 +0200, Hans de Goede wrote: > netdev.h should not be included in device-model enabled builds (doing so > causes compiler warnings about struct eth_device not being declared), but > we do use sunxi_gmac_initialize in the device-model case, so move it out of > netdev.h . Worth keeping the emac one alongside? Regardless: > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Hi, Thanks for the reviews! On 26-04-15 05:23, Ian Campbell wrote: > On Fri, 2015-04-24 at 15:48 +0200, Hans de Goede wrote: >> netdev.h should not be included in device-model enabled builds (doing so >> causes compiler warnings about struct eth_device not being declared), but >> we do use sunxi_gmac_initialize in the device-model case, so move it out of >> netdev.h . > > Worth keeping the emac one alongside? It gets completely removed in "sunxi: emac: Remove non device-model code" :) Regards, Hans
diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h index 60a5bd8..9df3744 100644 --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h @@ -23,4 +23,7 @@ void sdelay(unsigned long); */ void return_to_fel(uint32_t lr, uint32_t sp); +/* Board / SoC level designware gmac init */ +int sunxi_gmac_initialize(bd_t *bis); + #endif diff --git a/include/netdev.h b/include/netdev.h index d96e1da..e6bdfdf 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -81,7 +81,6 @@ int skge_initialize(bd_t *bis); int smc91111_initialize(u8 dev_num, int base_addr); int smc911x_initialize(u8 dev_num, int base_addr); int sunxi_emac_initialize(bd_t *bis); -int sunxi_gmac_initialize(bd_t *bis); int tsi108_eth_initialize(bd_t *bis); int uec_standard_init(bd_t *bis); int uli526x_initialize(bd_t *bis);
netdev.h should not be included in device-model enabled builds (doing so causes compiler warnings about struct eth_device not being declared), but we do use sunxi_gmac_initialize in the device-model case, so move it out of netdev.h . Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/include/asm/arch-sunxi/sys_proto.h | 3 +++ include/netdev.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)