diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 23:47:22 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 23:47:22 +0100 |
| commit | 5f1223c5b09262bb5c88f77d2938c9a5ffefa40c (patch) | |
| tree | 635d652db2883c3933af3e5a3f68d42803048e55 /drivers/soc | |
| parent | Merge tag 'v4.11-armsoc-drivers1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | soc: ti: knav: cleanup includes and sort header files (diff) | |
| download | linux-5f1223c5b09262bb5c88f77d2938c9a5ffefa40c.tar.xz linux-5f1223c5b09262bb5c88f77d2938c9a5ffefa40c.zip | |
Merge tag 'keystone_soc_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
Couple of minor cleanups for Navigator drivers for 4.11
* tag 'keystone_soc_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
soc: ti: knav: cleanup includes and sort header files
soc: ti: knav_dma: fix typos in trace message
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/ti/knav_dma.c | 4 | ||||
| -rw-r--r-- | drivers/soc/ti/knav_qmss_acc.c | 15 | ||||
| -rw-r--r-- | drivers/soc/ti/knav_qmss_queue.c | 25 |
3 files changed, 13 insertions, 31 deletions
diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c index 1a7b5caa127b..ecebe2eecc3a 100644 --- a/drivers/soc/ti/knav_dma.c +++ b/drivers/soc/ti/knav_dma.c @@ -395,7 +395,7 @@ static int of_channel_match_helper(struct device_node *np, const char *name, if (of_parse_phandle_with_fixed_args(np, "ti,navigator-dmas", 1, index, &args)) { - dev_err(kdev->dev, "Missing the pahndle args name %s\n", name); + dev_err(kdev->dev, "Missing the phandle args name %s\n", name); return -ENODEV; } @@ -436,7 +436,7 @@ void *knav_dma_open_channel(struct device *dev, const char *name, } dev_dbg(kdev->dev, "initializing %s channel %d from DMA %s\n", - config->direction == DMA_MEM_TO_DEV ? "transmit" : + config->direction == DMA_MEM_TO_DEV ? "transmit" : config->direction == DMA_DEV_TO_MEM ? "receive" : "unknown", chan_num, instance); diff --git a/drivers/soc/ti/knav_qmss_acc.c b/drivers/soc/ti/knav_qmss_acc.c index 0612ebae0a09..3d7225f4e77f 100644 --- a/drivers/soc/ti/knav_qmss_acc.c +++ b/drivers/soc/ti/knav_qmss_acc.c @@ -16,21 +16,12 @@ * General Public License for more details. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/device.h> +#include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/interrupt.h> -#include <linux/bitops.h> -#include <linux/slab.h> -#include <linux/spinlock.h> -#include <linux/soc/ti/knav_qmss.h> -#include <linux/platform_device.h> -#include <linux/dma-mapping.h> -#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/module.h> #include <linux/of_address.h> -#include <linux/firmware.h> +#include <linux/soc/ti/knav_qmss.h> #include "knav_qmss.h" diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c index eacad57f2977..279e7c5551dd 100644 --- a/drivers/soc/ti/knav_qmss_queue.c +++ b/drivers/soc/ti/knav_qmss_queue.c @@ -16,26 +16,17 @@ * General Public License for more details. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/device.h> -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/interrupt.h> -#include <linux/bitops.h> -#include <linux/slab.h> -#include <linux/spinlock.h> -#include <linux/platform_device.h> +#include <linux/debugfs.h> #include <linux/dma-mapping.h> -#include <linux/of.h> -#include <linux/of_irq.h> -#include <linux/of_device.h> +#include <linux/firmware.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/module.h> #include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_irq.h> #include <linux/pm_runtime.h> -#include <linux/firmware.h> -#include <linux/debugfs.h> -#include <linux/seq_file.h> -#include <linux/string.h> +#include <linux/slab.h> #include <linux/soc/ti/knav_qmss.h> #include "knav_qmss.h" |