From patchwork Tue Aug 27 09:31:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2850071 X-Patchwork-Delegate: lethal@linux-sh.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 72A909F4D5 for ; Tue, 27 Aug 2013 09:31:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2DB920501 for ; Tue, 27 Aug 2013 09:31:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4A2720498 for ; Tue, 27 Aug 2013 09:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753112Ab3H0JbX (ORCPT ); Tue, 27 Aug 2013 05:31:23 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:65281 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752877Ab3H0JbU (ORCPT ); Tue, 27 Aug 2013 05:31:20 -0400 Received: from axis700.grange (dslb-094-221-096-106.pools.arcor-ip.net [94.221.96.106]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LhRY4-1Vrvx10Ox6-00mrqX; Tue, 27 Aug 2013 11:31:19 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 82CA740BB4; Tue, 27 Aug 2013 11:31:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 79B3540BB3; Tue, 27 Aug 2013 11:31:18 +0200 (CEST) Date: Tue, 27 Aug 2013 11:31:18 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: "Koul, Vinod" cc: linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Magnus Damm Subject: [PATCH] DMA: shdma: fix compiler warning after a bad merge Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:1ieRfZyJeQGnBN8ZSyvyll2b64bx9TzfnHvSlHRDH0e cbeetHrSUdTPbTbT9b8+jvWPBYt03iTIqgMFmz4VlSiG96OOwR pJrfkDqm7yAFJR/OmSwZWayyxBgB3Uo/UEz/NeAQiDCeBG9G0I OI0F0uEijcS963kzT0BFpxL8z7LWGA7Ts4ehQxPinBsFDJ4TAd ezzmhdmt5V/1C0AnwZ1aDvLovjjmsag7wWij4IpzG0EORUyT2O iW5JhQmguFKFEtbYPl3P5HGCBCkQg7uPsFtpuwiB011jZumPXg ZkLPj2P21y4KoCF20K06ejqmG4yE2EtD8qpoEggVyNmEDDnQjW 58qZ6qV1XKHxMSzyv0VwBsoBh77+570QH39RQa2PiTF3IRiE1S +OrrxJdTtG5yg== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A recent merge commit commit ba1e06e3dff9a0bb0758d169e50cbb04a67a402c Author: Vinod Koul Merge branch 'topic/sh' into next introduced a compiler warning: drivers/dma/sh/shdmac.c: In function 'sh_dmae_probe': drivers/dma/sh/shdmac.c:697: warning: assignment discards qualifiers from pointer target type This patch re-adds the dropped "const" qualifier and fixes the warning. Signed-off-by: Guennadi Liakhovetski --- drivers/dma/sh/shdmac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index dcd344e..1069e88 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -684,7 +684,7 @@ MODULE_DEVICE_TABLE(of, sh_dmae_of_match); static int sh_dmae_probe(struct platform_device *pdev) { - struct sh_dmae_pdata *pdata; + const struct sh_dmae_pdata *pdata; unsigned long irqflags = IRQF_DISABLED, chan_flag[SH_DMAE_MAX_CHANNELS] = {}; int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];