kernel: generic: Add kernel 4.14 support
[oweals/openwrt.git] / target / linux / generic / pending-4.14 / 340-MIPS-mm-remove-mips_dma_mapping_error.patch
1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Tue, 5 Dec 2017 12:34:31 +0100
3 Subject: [PATCH] MIPS: mm: remove mips_dma_mapping_error
4
5 dma_mapping_error() already checks if ops->mapping_error is a null
6 pointer
7
8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 ---
10
11 --- a/arch/mips/mm/dma-default.c
12 +++ b/arch/mips/mm/dma-default.c
13 @@ -373,11 +373,6 @@ static void mips_dma_sync_sg_for_device(
14         }
15  }
16  
17 -static int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
18 -{
19 -       return 0;
20 -}
21 -
22  static int mips_dma_supported(struct device *dev, u64 mask)
23  {
24         return plat_dma_supported(dev, mask);
25 @@ -406,7 +401,6 @@ static const struct dma_map_ops mips_def
26         .sync_single_for_device = mips_dma_sync_single_for_device,
27         .sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
28         .sync_sg_for_device = mips_dma_sync_sg_for_device,
29 -       .mapping_error = mips_dma_mapping_error,
30         .dma_supported = mips_dma_supported
31  };
32