Merge branches 'davinci/cleanup', 'imx/cleanup', 'omap/cleanup' and 'pxa/cleanup...

diff --combined sound/soc/imx/imx-pcm-dma-mx2.c
index 4173b3d87f979d2757f1498bd503f15b07195542,4173b3d87f979d2757f1498bd503f15b07195542,b2ed764fd89623470ddd8c766b428e195cd11483,aab7765f401a0904397c9c22a801fc10670b73f4,4173b3d87f979d2757f1498bd503f15b07195542..43fdc24f7e8d6fdf323f096fee6c01682c433a24
--- 1/sound/soc/imx/imx-pcm-dma-mx2.c
--- 2/sound/soc/imx/imx-pcm-dma-mx2.c
--- 3/sound/soc/imx/imx-pcm-dma-mx2.c
--- 4/sound/soc/imx/imx-pcm-dma-mx2.c
--- 5/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@@@@@ -110,12 -110,12 -110,12 -110,12 -110,12 +110,12 @@@@@@ static int imx_ssi_dma_alloc(struct snd
                slave_config.direction = DMA_TO_DEVICE;
                slave_config.dst_addr = dma_params->dma_addr;
                slave_config.dst_addr_width = buswidth;
-- --           slave_config.dst_maxburst = dma_params->burstsize * buswidth;
++ ++           slave_config.dst_maxburst = dma_params->burstsize;
        } else {
                slave_config.direction = DMA_FROM_DEVICE;
                slave_config.src_addr = dma_params->dma_addr;
                slave_config.src_addr_width = buswidth;
-- --           slave_config.src_maxburst = dma_params->burstsize * buswidth;
++ ++           slave_config.src_maxburst = dma_params->burstsize;
        }
     
        ret = dmaengine_slave_config(iprtd->dma_chan, &slave_config);
@@@@@@ -337,5 -337,5 -337,3 -337,3 -337,5 +337,5 @@@@@@ static void __exit snd_imx_pcm_exit(voi
        platform_driver_unregister(&imx_pcm_driver);
     }
     module_exit(snd_imx_pcm_exit);
  ++ MODULE_LICENSE("GPL");
  ++ MODULE_ALIAS("platform:imx-pcm-audio");