Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932172AbcKIEgN (ORCPT ); Tue, 8 Nov 2016 23:36:13 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:43986 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752354AbcKIEet (ORCPT ); Tue, 8 Nov 2016 23:34:49 -0500 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com uA94WsgG025515 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Alan Cox , David Woodhouse , Jason Roberts , Chuanxiao Dong , Dinh Nguyen , Masahiro Yamada , linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse , Cyrille Pitchen Subject: [PATCH 05/11] mtd: nand: denali: remove "Spectra:" prefix from printk strings Date: Wed, 9 Nov 2016 13:35:24 +0900 Message-Id: <1478666130-13413-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478666130-13413-1-git-send-email-yamada.masahiro@socionext.com> References: <1478666130-13413-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2486 Lines: 73 As far as I understood from the Kconfig menu deleted by commit be7f39c5ecf5 ("Staging: delete spectra driver"), the "Spectra" is specific to Intel Moorestown Platform. The Denali NAND controller IP is used for various SoCs such as Altera SOCFPGA, Socionext UniPhier, etc. The platform specific strings are not preferred in this driver. Signed-off-by: Masahiro Yamada --- As an ARM-SoC developer, I only need denali.c and denali_dt.c. I see some "Spectra:" in drivers/mtd/nand/denali_pci.c as well. I was not quite sure if they are needed or not. If desired, I can update this patch to remove them too. drivers/mtd/nand/denali.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 80d3e26..78d795b 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -402,7 +402,7 @@ static void get_hynix_nand_para(struct denali_nand_info *denali, break; default: dev_warn(denali->dev, - "Spectra: Unknown Hynix NAND (Device ID: 0x%x).\n" + "Unknown Hynix NAND (Device ID: 0x%x).\n" "Will use default parameter values instead.\n", device_id); } @@ -1458,7 +1458,7 @@ int denali_init(struct denali_nand_info *denali) */ if (request_irq(denali->irq, denali_isr, IRQF_SHARED, DENALI_NAND_NAME, denali)) { - pr_err("Spectra: Unable to allocate IRQ\n"); + dev_err(denali->dev, "Unable to request IRQ\n"); return -ENODEV; } @@ -1495,7 +1495,7 @@ int denali_init(struct denali_nand_info *denali) /* Is 32-bit DMA supported? */ ret = dma_set_mask(denali->dev, DMA_BIT_MASK(32)); if (ret) { - pr_err("Spectra: no usable DMA configuration\n"); + dev_err(denali->dev, "no usable DMA configuration\n"); goto failed_req_irq; } @@ -1503,7 +1503,7 @@ int denali_init(struct denali_nand_info *denali) mtd->writesize + mtd->oobsize, DMA_BIDIRECTIONAL); if (dma_mapping_error(denali->dev, denali->buf.dma_buf)) { - dev_err(denali->dev, "Spectra: failed to map DMA buffer\n"); + dev_err(denali->dev, "failed to map DMA buffer\n"); ret = -EIO; goto failed_req_irq; } @@ -1598,8 +1598,7 @@ int denali_init(struct denali_nand_info *denali) ret = mtd_device_register(mtd, NULL, 0); if (ret) { - dev_err(denali->dev, "Spectra: Failed to register MTD: %d\n", - ret); + dev_err(denali->dev, "Failed to register MTD: %d\n", ret); goto failed_req_irq; } return 0; -- 1.9.1