Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

DMA-API: net: b43: replace dma_set_mask()+dma_set_coherent_mask() with new helper

Replace the following sequence:

dma_set_mask(dev, mask);
dma_set_coherent_mask(dev, mask);

with a call to the new helper dma_set_mask_and_coherent().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

+3 -6
+3 -6
drivers/net/wireless/b43/dma.c
··· 1065 1065 /* Try to set the DMA mask. If it fails, try falling back to a 1066 1066 * lower mask, as we can always also support a lower one. */ 1067 1067 while (1) { 1068 - err = dma_set_mask(dev->dev->dma_dev, mask); 1069 - if (!err) { 1070 - err = dma_set_coherent_mask(dev->dev->dma_dev, mask); 1071 - if (!err) 1072 - break; 1073 - } 1068 + err = dma_set_mask_and_coherent(dev->dev->dma_dev, mask); 1069 + if (!err) 1070 + break; 1074 1071 if (mask == DMA_BIT_MASK(64)) { 1075 1072 mask = DMA_BIT_MASK(32); 1076 1073 fallback = true;