[PATCH] crypto: p10-aes-gcm - remove duplicate include header
From: Ye Xingchen crypto/algapi.h is included more than once. Signed-off-by: Ye Xingchen --- arch/powerpc/crypto/aes-gcm-p10-glue.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/crypto/aes-gcm-p10-glue.c b/arch/powerpc/crypto/aes-gcm-p10-glue.c index c95f5b7cc456..1533c8cdd26f 100644 --- a/arch/powerpc/crypto/aes-gcm-p10-glue.c +++ b/arch/powerpc/crypto/aes-gcm-p10-glue.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include -- 2.25.1
[PATCH linux-next] powerpc/cell/axon_msi: Use dma_zalloc_coherent()
From: ye xingchen Instead of using dma_alloc_coherent() and memset() directly use dma_zalloc_coherent(). Signed-off-by: ye xingchen --- arch/powerpc/platforms/cell/axon_msi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 0c11aad896c7..8a4c522c8e67 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c @@ -358,8 +358,8 @@ static int axon_msi_probe(struct platform_device *device) goto out_free_msic; } - msic->fifo_virt = dma_alloc_coherent(>dev, MSIC_FIFO_SIZE_BYTES, ->fifo_phys, GFP_KERNEL); + msic->fifo_virt = dma_zalloc_coherent(>dev, MSIC_FIFO_SIZE_BYTES, + >fifo_phys, GFP_KERNEL); if (!msic->fifo_virt) { printk(KERN_ERR "axon_msi: couldn't allocate fifo for %pOF\n", dn); @@ -372,7 +372,6 @@ static int axon_msi_probe(struct platform_device *device) dn); goto out_free_fifo; } - memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES); /* We rely on being able to stash a virq in a u16, so limit irqs to < 65536 */ msic->irq_domain = irq_domain_add_nomap(dn, 65536, _host_ops, msic); -- 2.25.1
[PATCH linux-next] crypto: p10-aes-gcm - remove duplicate included header files
From: ye xingchen crypto/algapi.h is included more than once. Signed-off-by: ye xingchen --- arch/powerpc/crypto/p10-aes-gcm-glue.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/crypto/p10-aes-gcm-glue.c b/arch/powerpc/crypto/p10-aes-gcm-glue.c index 777e6b5254da..a17d3e8d8f3c 100644 --- a/arch/powerpc/crypto/p10-aes-gcm-glue.c +++ b/arch/powerpc/crypto/p10-aes-gcm-glue.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include -- 2.25.1
[PATCH] ASoC: imx-audmux: use sysfs_emit() to instead of scnprintf()
From: ye xingchen Follow the advice of the Documentation/filesystems/sysfs.rst and show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Signed-off-by: ye xingchen --- sound/soc/fsl/imx-audmux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 50b71e5d4589..582f1e2431ee 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -75,8 +75,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, if (!buf) return -ENOMEM; - ret = scnprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n", - pdcr, ptcr); + ret = sysfs_emit(buf, "PDCR: %08x\nPTCR: %08x\n", pdcr, ptcr); if (ptcr & IMX_AUDMUX_V2_PTCR_TFSDIR) ret += scnprintf(buf + ret, PAGE_SIZE - ret, -- 2.25.1