Commit 8552bb4f16800d5ebc176a2cf5f2aa55b22731ea
Committed by
Vinod Koul
1 parent
ff0e0f4f56
Exists in
master
and in
20 other branches
dma: of: Remove check on always true condition
Both of_dma_nbcells field of the of_dma_controller and the args_count field of the dma_spec are initialized by parsing the #dma-cells attribute of their device tree node. So if the device tree nodes of a DMA controller and the dma_spec match this means that of_dma_nbcells and args_count will also match. So the second test in the of_dma_find_controller loop is redundant because given the first test yields true the second test will also yield true. So we can safely remove the test whether of_dma_nbcells matches args_count. Since this was the last user of the of_dma_nbcells field we can remove it altogether. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Showing 2 changed files with 1 additions and 14 deletions Side-by-side Diff
drivers/dma/of-dma.c
... | ... | @@ -35,8 +35,7 @@ |
35 | 35 | struct of_dma *ofdma; |
36 | 36 | |
37 | 37 | list_for_each_entry(ofdma, &of_dma_list, of_dma_controllers) |
38 | - if ((ofdma->of_node == dma_spec->np) && | |
39 | - (ofdma->of_dma_nbcells == dma_spec->args_count)) | |
38 | + if (ofdma->of_node == dma_spec->np) | |
40 | 39 | return ofdma; |
41 | 40 | |
42 | 41 | pr_debug("%s: can't find DMA controller %s\n", __func__, |
... | ... | @@ -64,7 +63,6 @@ |
64 | 63 | void *data) |
65 | 64 | { |
66 | 65 | struct of_dma *ofdma; |
67 | - const __be32 *prop; | |
68 | 66 | |
69 | 67 | if (!np || !of_dma_xlate) { |
70 | 68 | pr_err("%s: not enough information provided\n", __func__); |
71 | 69 | |
... | ... | @@ -75,17 +73,7 @@ |
75 | 73 | if (!ofdma) |
76 | 74 | return -ENOMEM; |
77 | 75 | |
78 | - prop = of_get_property(np, "#dma-cells", NULL); | |
79 | - if (!prop) { | |
80 | - pr_err("%s: #dma-cells property is missing\n", | |
81 | - __func__); | |
82 | - kfree(ofdma); | |
83 | - return -EINVAL; | |
84 | - } | |
85 | - | |
86 | - | |
87 | 76 | ofdma->of_node = np; |
88 | - ofdma->of_dma_nbcells = be32_to_cpup(prop); | |
89 | 77 | ofdma->of_dma_xlate = of_dma_xlate; |
90 | 78 | ofdma->of_dma_data = data; |
91 | 79 |
include/linux/of_dma.h