From patchwork Sat Apr 16 20:13:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102514 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp566840qge; Sat, 16 Apr 2016 13:15:42 -0700 (PDT) X-Received: by 10.66.244.233 with SMTP id xj9mr38976133pac.19.1460837742039; Sat, 16 Apr 2016 13:15:42 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ya3si5464696pab.2.2016.04.16.13.15.41; Sat, 16 Apr 2016 13:15:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751891AbcDPUPf (ORCPT + 29 others); Sat, 16 Apr 2016 16:15:35 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:54606 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751614AbcDPUPe (ORCPT ); Sat, 16 Apr 2016 16:15:34 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LsyHC-1bsjN40vbG-012cT8; Sat, 16 Apr 2016 22:14:24 +0200 From: Arnd Bergmann To: Thor Thayer , Doug Thompson , Borislav Petkov , Mauro Carvalho Chehab Cc: Arnd Bergmann , Alan Tull , Dinh Nguyen , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] EDAC, altera: remove useless casts Date: Sat, 16 Apr 2016 22:13:55 +0200 Message-Id: <1460837650-1237650-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:1OqIDYNzdnDpLq7gYHnDbVtkGUYNt/9BaSw+Aztiiyi2f4k6Inf whwrfgQRwOawFHrfmsYQJt9j1OnBGEQfk2ufxeVbpQHO5ALAG+OyCWdTSOQe4It2SGtQygB uM8vfQKJQcm8TgpVOKMB0xMxFZMeG93v+5PiFEpeNxdgSIPy3aQ1EQkCnoJS27B9doVN7P/ LHQzhjRbqHCMMnSK4is5g== X-UI-Out-Filterresults: notjunk:1; V01:K0:CO6RaDE6QCs=:iP0vDEkCZyogwWHiQbF3tB OyIi14MTbuc8SWtfQNBhRuG3psZLab5DEQlp18bsqVmTxdG6wiAP7STErXcBzpcrPMBMRLuqI o5SdLuvZIyDRqo50dO6DdpoxSodK0cGfbyfb3HDg+l26sXXpUo1EEzg7JOyQyUwf+z9NiCvwU Yc8lH10ZnQoYUnq7qSXo2xfv5xo5m37TQMw0UD6V3syHORooEa2QV4B6+Zt+WdpMzuo4uqS5f /Uh0IK9+ZgJZk9kjeGlrVB4izCoEHSdy51OXfCJALXv405SGvmik0NJR7I+cFuTDwh8s6jyaK o/xuOaHgDGgyVyJzZg3nFd6HFwzEbfSrg7bFG6Vo1ppVwYjTtGRdZfoZ272e3l0k8rCicVaav OSd5KnMFOpkvo5j8pOVk60MrIl9jBs8qhJFfvreR0FQN/FyB3mnJQhOdPhsSND6tJBY3Iy0bW bC4RnZnTqyjgZc0YOiaXT1b/wo64iy2WaLrF86S5QdFoPDrsNH7ntu8ekOaxCO9m+VvaG+h8w 5+L8zFa0rW0BtRQsnEf9RtkBGav+OUIjbGjkK+NV7UIw2lIegq5jhmku2YAai4gxR+2U4kicz 2n9F4slaHvhJc54YT3ENSKwZXHY8DTlzi0vkKgvJOOpjstiZDBkNjyeo/BPGuTOpIQeFCYo7W jXaoTcUFIpusK1FOXnk1d6o/QrKxtGDv+lybTz7wZ7Sf+tHZpDXPBZWdBIrcwCS0vuDE= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The altera EDAC driver refers to its per-device data using a cast to '(void *)', which makes the pointer non-const, though both the source and destination are actually const. Removing the annotation makes the reference (almost) fit into a single line for improved readability, and ensures that it is actually defined as const. Signed-off-by: Arnd Bergmann --- drivers/edac/altera_edac.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) -- 2.7.0 diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 11775dc0b139..cc987b4ce908 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -232,8 +232,8 @@ static unsigned long get_total_mem(void) } static const struct of_device_id altr_sdram_ctrl_of_match[] = { - { .compatible = "altr,sdram-edac", .data = (void *)&c5_data}, - { .compatible = "altr,sdram-edac-a10", .data = (void *)&a10_data}, + { .compatible = "altr,sdram-edac", .data = &c5_data}, + { .compatible = "altr,sdram-edac-a10", .data = &a10_data}, {}, }; MODULE_DEVICE_TABLE(of, altr_sdram_ctrl_of_match); @@ -705,15 +705,12 @@ static void altr_create_edacdev_dbgfs(struct edac_device_ctl_info *edac_dci, static const struct of_device_id altr_edac_device_of_match[] = { #ifdef CONFIG_EDAC_ALTERA_L2C - { .compatible = "altr,socfpga-l2-ecc", .data = (void *)&l2ecc_data }, - { .compatible = "altr,socfpga-a10-l2-ecc", - .data = (void *)&a10_l2ecc_data }, + { .compatible = "altr,socfpga-l2-ecc", .data = &l2ecc_data }, + { .compatible = "altr,socfpga-a10-l2-ecc", .data = &a10_l2ecc_data }, #endif #ifdef CONFIG_EDAC_ALTERA_OCRAM - { .compatible = "altr,socfpga-ocram-ecc", - .data = (void *)&ocramecc_data }, - { .compatible = "altr,socfpga-a10-ocram-ecc", - .data = (void *)&a10_ocramecc_data }, + { .compatible = "altr,socfpga-ocram-ecc", .data = &ocramecc_data }, + { .compatible = "altr,socfpga-a10-ocram-ecc", .data = &a10_ocramecc_data }, #endif {}, }; From patchwork Sat Apr 16 20:13:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102513 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp566850qge; Sat, 16 Apr 2016 13:15:44 -0700 (PDT) X-Received: by 10.98.10.74 with SMTP id s71mr38955896pfi.86.1460837744364; Sat, 16 Apr 2016 13:15:44 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ya3si5464696pab.2.2016.04.16.13.15.44; Sat, 16 Apr 2016 13:15:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751973AbcDPUPi (ORCPT + 29 others); Sat, 16 Apr 2016 16:15:38 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59641 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751813AbcDPUPg (ORCPT ); Sat, 16 Apr 2016 16:15:36 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0MUnfA-1bGteT2WCa-00YD4K; Sat, 16 Apr 2016 22:14:29 +0200 From: Arnd Bergmann To: Thor Thayer , Doug Thompson , Borislav Petkov , Mauro Carvalho Chehab Cc: Arnd Bergmann , Alan Tull , Dinh Nguyen , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] EDAC, altera: avoid unused function warnings Date: Sat, 16 Apr 2016 22:13:56 +0200 Message-Id: <1460837650-1237650-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460837650-1237650-1-git-send-email-arnd@arndb.de> References: <1460837650-1237650-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:+510sHWARZkgGnEqm34iDzUjV8Zk0sSZtmuu7Lk9SLBwCSiQIEG N5t+oAbcRihMOhljzeabXP+ttqbl4OL8AELEMNNtZmsh5lhisn1z5RQbDjBP1wojbaQLLyj Pd5mN5a/lQJPNRuemH8jI/xRovFD0tWlNVFnDgdJBt16JI89NK1jbTbTzVWqxCPJFrLDJjs jSbEgARtwpiWig7sXil7w== X-UI-Out-Filterresults: notjunk:1; V01:K0:F8B+rGLmbNQ=:TO9BjNAwYUYSHcWUPEIP8r hDhD7xzsWVAhofLmccKGPrfJRc54kX0W/g63yR5CvL/yhlyr7XeHfw6pQCAvAw5ZAy8yO9esW to9TvydoJUuwCDzubOzoTYE4m96X7Nbpu9jmwi5A6aJK/+0RvUEqAYk558YWYnkr03NbGhA3G aIefMehBTL1NCt85LQNGCkT/GdLNhscljyEklQpW+s7oF0RwigAp3x97kRFYASV4vc8ghhnyN fglMYZ+tSAuhpyfrQxo320NR3BvP1gUk5pdGpDcM+ZFUtZsFyqOvCfJdFnRrugtsdntMupmb5 VQmTBou1YLgAOhbjltMz1gvf9XxxIfmGu4qbcZGXg+owjFhQrJfEAk7cDOm71+STD6BZq9JPL tgsiFkkaYdrpXSv9vkycXEGTJHtAu24ySK2TcEvkIAOJFAfuHn78dUHhi/HjR75LOnKIrG+pp Yaq6wx9wH0uhTo9x0h7LU6ltBzR/867mY+F0XgnmKfBYqXhI4WugJKBAOQLWvUPsjCNhbYTR9 lnFTyQKOecCaHrWAtgisSKT1krd2XEVAIXuP8mb7r87PVWu8EBLRJv1WBbNTZXbnQY//FX8Wo h/pXs81PRyy3+lIspg6DH/boSXCmF6huYbGqJV7ChZy6kSf2s2ug0m9/1342jcZ3/quiDscsf NcnXy8O5cPQVGzhs3F+0MTeq9VK/RP+qpT+tM9rOdm2mhdQ9r3nqrQ8RpaLzfCTKXL4E= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The recently added Arria10 OCRAM ECC support caused some new harmless warnings about unused functions when it is disabled: drivers/edac/altera_edac.c:1067:20: error: 'altr_edac_a10_ecc_irq' defined but not used [-Werror=unused-function] drivers/edac/altera_edac.c:658:12: error: 'altr_check_ecc_deps' defined but not used [-Werror=unused-function] This rearranges the code slightly to have those two functions inside of the same #ifdef that hides their callers. It also manages to avoid a forward declaration of the IRQ handler in the process. Signed-off-by: Arnd Bergmann Fixes: c7b4be8db8bc ("EDAC, altera: Add Arria10 OCRAM ECC support") --- drivers/edac/altera_edac.c | 78 ++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 41 deletions(-) -- 2.7.0 diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index cc987b4ce908..5b4d223d6d68 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -649,26 +649,6 @@ static ssize_t altr_edac_device_trig(struct file *file, return count; } -/* - * Test for memory's ECC dependencies upon entry because platform specific - * startup should have initialized the memory and enabled the ECC. - * Can't turn on ECC here because accessing un-initialized memory will - * cause CE/UE errors possibly causing an ABORT. - */ -static int altr_check_ecc_deps(struct altr_edac_device_dev *device) -{ - void __iomem *base = device->base; - const struct edac_device_prv_data *prv = device->data; - - if (readl(base + prv->ecc_en_ofst) & prv->ecc_enable_mask) - return 0; - - edac_printk(KERN_ERR, EDAC_DEVICE, - "%s: No ECC present or ECC disabled.\n", - device->edac_dev_name); - return -ENODEV; -} - static const struct file_operations altr_edac_device_inject_fops = { .open = simple_open, .write = altr_edac_device_trig, @@ -848,6 +828,25 @@ module_platform_driver(altr_edac_device_driver); /*********************** OCRAM EDAC Device Functions *********************/ #ifdef CONFIG_EDAC_ALTERA_OCRAM +/* + * Test for memory's ECC dependencies upon entry because platform specific + * startup should have initialized the memory and enabled the ECC. + * Can't turn on ECC here because accessing un-initialized memory will + * cause CE/UE errors possibly causing an ABORT. + */ +static int altr_check_ecc_deps(struct altr_edac_device_dev *device) +{ + void __iomem *base = device->base; + const struct edac_device_prv_data *prv = device->data; + + if (readl(base + prv->ecc_en_ofst) & prv->ecc_enable_mask) + return 0; + + edac_printk(KERN_ERR, EDAC_DEVICE, + "%s: No ECC present or ECC disabled.\n", + device->edac_dev_name); + return -ENODEV; +} static void *ocram_alloc_mem(size_t size, void **other) { @@ -883,6 +882,24 @@ static void ocram_free_mem(void *p, size_t size, void *other) gen_pool_free((struct gen_pool *)other, (u32)p, size); } +static irqreturn_t altr_edac_a10_ecc_irq(struct altr_edac_device_dev *dci, + bool sberr) +{ + void __iomem *base = dci->base; + + if (sberr) { + writel(ALTR_A10_ECC_SERRPENA, + base + ALTR_A10_ECC_INTSTAT_OFST); + edac_device_handle_ce(dci->edac_dev, 0, 0, dci->edac_dev_name); + } else { + writel(ALTR_A10_ECC_DERRPENA, + base + ALTR_A10_ECC_INTSTAT_OFST); + edac_device_handle_ue(dci->edac_dev, 0, 0, dci->edac_dev_name); + panic("\nEDAC:ECC_DEVICE[Uncorrectable errors]\n"); + } + return IRQ_HANDLED; +} + const struct edac_device_prv_data ocramecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_SERR), @@ -899,9 +916,6 @@ const struct edac_device_prv_data ocramecc_data = { .inject_fops = &altr_edac_device_inject_fops, }; -static irqreturn_t altr_edac_a10_ecc_irq(struct altr_edac_device_dev *dci, - bool sberr); - const struct edac_device_prv_data a10_ocramecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, @@ -1061,24 +1075,6 @@ static ssize_t altr_edac_a10_device_trig(struct file *file, return count; } -static irqreturn_t altr_edac_a10_ecc_irq(struct altr_edac_device_dev *dci, - bool sberr) -{ - void __iomem *base = dci->base; - - if (sberr) { - writel(ALTR_A10_ECC_SERRPENA, - base + ALTR_A10_ECC_INTSTAT_OFST); - edac_device_handle_ce(dci->edac_dev, 0, 0, dci->edac_dev_name); - } else { - writel(ALTR_A10_ECC_DERRPENA, - base + ALTR_A10_ECC_INTSTAT_OFST); - edac_device_handle_ue(dci->edac_dev, 0, 0, dci->edac_dev_name); - panic("\nEDAC:ECC_DEVICE[Uncorrectable errors]\n"); - } - return IRQ_HANDLED; -} - static irqreturn_t altr_edac_a10_irq_handler(int irq, void *dev_id) { irqreturn_t rc = IRQ_NONE;