OSDN Git Service

ethernet: s2io: Use dma_set_mask_and_coherent() and simplify code
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 2 Jan 2022 20:27:39 +0000 (21:27 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Jan 2022 10:42:58 +0000 (10:42 +0000)
commit7120075ec41aed3bf377df7924d213f1c43f7462
tree1de66c5e3d214e66e1a46605a6c6aad4aad6cb45
parent6bf950a8ff72920340dfdec93c18bd3f5f35de6a
ethernet: s2io: Use dma_set_mask_and_coherent() and simplify code

Use dma_set_mask_and_coherent() instead of unrolling it with some
dma_set_mask()+dma_set_coherent_mask().

Moreover, as stated in [1], dma_set_mask() with a 64-bit mask will never
fail if dev->dma_mask is non-NULL.
So, if it fails, the 32 bits case will also fail for the same reason.

That said, 'dma_flag' can only be 'true' after a successful
dma_set_mask_and_coherent().

Simplify code and remove some dead code accordingly, including the now
useless 'high_dma_flag' field in 'struct s2io_nic'.

[1]: https://lkml.org/lkml/2021/6/7/398

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/neterion/s2io.h