On 13.10.2016 16:40, Tobias Klauser wrote:
> On 2016-10-13 at 14:23:49 +0200, Michal Simek <michal.si...@xilinx.com> wrote:
>> On 13.10.2016 13:28, Tobias Klauser wrote:
>>> The dev parameter passed to __axienet_device_reset() is not used inside
>>> the function, so remove it.
>>>
>>> Signed-off-by: Tobias Klauser <tklau...@distanz.ch>
>>> ---
>>> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++------
>>> 1 file changed, 5 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> index 35f9f9742a48..c688d68c39aa 100644
>>> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> @@ -431,8 +431,7 @@ static void axienet_setoptions(struct net_device *ndev,
>>> u32 options)
>>> lp->options |= options;
>>> }
>>>
>>> -static void __axienet_device_reset(struct axienet_local *lp,
>>> - struct device *dev, off_t offset)
>>> +static void __axienet_device_reset(struct axienet_local *lp, off_t offset)
>>> {
>>> u32 timeout;
>>> /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
>>> @@ -468,8 +467,8 @@ static void axienet_device_reset(struct net_device
>>> *ndev)
>>> u32 axienet_status;
>>> struct axienet_local *lp = netdev_priv(ndev);
>>>
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
>>>
>>> lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
>>> lp->options |= XAE_OPTION_VLAN;
>>> @@ -1338,8 +1337,8 @@ static void axienet_dma_err_handler(unsigned long
>>> data)
>>> axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
>>> ~XAE_MDIO_MC_MDIOEN_MASK));
>>>
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
>>>
>>> axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
>>> axienet_mdio_wait_until_ready(lp);
>>>
>>
>> Can you please send this directly to mainline?
>> And put my:
>> Reviewed-by: Michal Simek <michal.si...@xilinx.com>
>
> The netdev mailing list was Cc'ed on the patch, so it should end up in
> davem's patch queue.
ah ok. I missed that.
Then we are good.
Thanks,
Michal
