[PATCH 05/11] mtd: nand: denali: remove "Spectra:" prefix from printk strings

[Marek Vasut]

On 11/09/2016 05:35 AM, Masahiro Yamada wrote:
> 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 <yamada.masahiro at socionext.com>

Reviewed-by: Marek Vasut <marek.vasut at gmail.com>

> ---
> 
> 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.

Is anyone even using Denali on Intel now ?

>  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");

Nit: For consistency's sake, use Failed with capital F . Fix the "No
usable DMA ..." too.

>  		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;
> 


-- 
Best regards,
Marek Vasut