merged.
Bruce
In message: [linux-yocto][linux-yocto][v5.4/standard/xlnx-soc][PATCH] net:
axienet: Remove static from __axienet_device_reset
on 16/11/2020 He Zhe wrote:
> __axienet_device_reset is referenced from different source files.
>
> Fixes: 59b0ea17cf64 ("net: axienet: Add missing return value type for
> __axienet_device_reset")
> Signed-off-by: He Zhe <[email protected]>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 +-
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h
> b/drivers/net/ethernet/xilinx/xilinx_axienet.h
> index b8d94f7ae9af..f9746e3eca95 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
> @@ -1065,7 +1065,7 @@ irqreturn_t __maybe_unused axienet_tx_irq(int irq, void
> *_ndev);
> irqreturn_t __maybe_unused axienet_rx_irq(int irq, void *_ndev);
> void axienet_start_xmit_done(struct net_device *ndev, struct axienet_dma_q
> *q);
> void axienet_dma_bd_release(struct net_device *ndev);
> -void __axienet_device_reset(struct axienet_dma_q *q);
> +int __axienet_device_reset(struct axienet_dma_q *q);
> void axienet_set_mac_address(struct net_device *ndev, const void *address);
> void axienet_set_multicast_list(struct net_device *ndev);
> int xaxienet_rx_poll(struct napi_struct *napi, int quota);
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 4f2a853d34b6..af98135aa1b2 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -387,7 +387,7 @@ static void xxvenet_setoptions(struct net_device *ndev,
> u32 options)
> }
>
>
> -static int __axienet_device_reset(struct axienet_dma_q *q)
> +int __axienet_device_reset(struct axienet_dma_q *q)
> {
> u32 timeout;
>
> --
> 2.17.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9176):
https://lists.yoctoproject.org/g/linux-yocto/message/9176
Mute This Topic: https://lists.yoctoproject.org/mt/78285501/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
