From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E5C7C433FF for ; Thu, 1 Aug 2019 06:31:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC4792089E for ; Thu, 1 Aug 2019 06:31:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729871AbfHAGbz (ORCPT ); Thu, 1 Aug 2019 02:31:55 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:33980 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728540AbfHAGbz (ORCPT ); Thu, 1 Aug 2019 02:31:55 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 5FCA728AC4D; Thu, 1 Aug 2019 07:31:53 +0100 (BST) Date: Thu, 1 Aug 2019 08:31:51 +0200 From: Boris Brezillon To: Cc: , , , , , , , Subject: Re: [PATCH 4/7] mtd: spi-nor: Split spi_nor_init_params() Message-ID: <20190801083151.5c96741d@collabora.com> In-Reply-To: <20190731090315.26798-5-tudor.ambarus@microchip.com> References: <20190731090315.26798-1-tudor.ambarus@microchip.com> <20190731090315.26798-5-tudor.ambarus@microchip.com> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 31 Jul 2019 09:03:33 +0000 wrote: > From: Tudor Ambarus > > Add functions to delimit what the chunks of code do: > > static void spi_nor_init_params() > { > spi_nor_default_init_params() > spi_nor_manufacturer_init_params() > spi_nor_sfdp_init_params() > } > > spi_nor_init_params() becomes of type void, as all its children > return void. > > Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon > --- > drivers/mtd/spi-nor/spi-nor.c | 58 ++++++++++++++++++++++++------------------- > 1 file changed, 32 insertions(+), 26 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index a906c36260c8..b2e72668e7ab 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -4312,6 +4312,25 @@ static void spi_nor_mfr_init_params(struct spi_nor *nor, > } > } > > +static void spi_nor_sfdp_init_params(struct spi_nor *nor, > + struct spi_nor_flash_parameter *params) > +{ > + struct spi_nor_flash_parameter sfdp_params; > + struct spi_nor_erase_map prev_map; > + > + memcpy(&sfdp_params, params, sizeof(sfdp_params)); > + memcpy(&prev_map, &nor->erase_map, sizeof(prev_map)); > + > + if (spi_nor_parse_sfdp(nor, &sfdp_params)) { > + nor->addr_width = 0; > + nor->flags &= ~SNOR_F_4B_OPCODES; > + /* restore previous erase map */ > + memcpy(&nor->erase_map, &prev_map, sizeof(nor->erase_map)); > + } else { > + memcpy(params, &sfdp_params, sizeof(*params)); > + } > +} > + > static void > spi_nor_manufacturer_init_params(struct spi_nor *nor, > struct spi_nor_flash_parameter *params) > @@ -4323,8 +4342,8 @@ spi_nor_manufacturer_init_params(struct spi_nor *nor, > return nor->info->fixups->default_init(nor, params); > } > > -static int spi_nor_init_params(struct spi_nor *nor, > - struct spi_nor_flash_parameter *params) > +static void spi_nor_default_init_params(struct spi_nor *nor, > + struct spi_nor_flash_parameter *params) > { > struct spi_nor_erase_map *map = &nor->erase_map; > const struct flash_info *info = nor->info; > @@ -4397,29 +4416,18 @@ static int spi_nor_init_params(struct spi_nor *nor, > spi_nor_set_erase_type(&map->erase_type[i], info->sector_size, > SPINOR_OP_SE); > spi_nor_init_uniform_erase_map(map, erase_mask, params->size); > +} > > - spi_nor_manufacturer_init_params(nor, params); > - > - if ((info->flags & (SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)) && > - !(info->flags & SPI_NOR_SKIP_SFDP)) { > - struct spi_nor_flash_parameter sfdp_params; > - struct spi_nor_erase_map prev_map; > - > - memcpy(&sfdp_params, params, sizeof(sfdp_params)); > - memcpy(&prev_map, &nor->erase_map, sizeof(prev_map)); > +static void spi_nor_init_params(struct spi_nor *nor, > + struct spi_nor_flash_parameter *params) > +{ > + spi_nor_default_init_params(nor, params); > > - if (spi_nor_parse_sfdp(nor, &sfdp_params)) { > - nor->addr_width = 0; > - nor->flags &= ~SNOR_F_4B_OPCODES; > - /* restore previous erase map */ > - memcpy(&nor->erase_map, &prev_map, > - sizeof(nor->erase_map)); > - } else { > - memcpy(params, &sfdp_params, sizeof(*params)); > - } > - } > + spi_nor_manufacturer_init_params(nor, params); > > - return 0; > + if ((nor->info->flags & (SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)) && > + !(nor->info->flags & SPI_NOR_SKIP_SFDP)) > + spi_nor_sfdp_init_params(nor, params); > } > > static int spi_nor_select_read(struct spi_nor *nor, > @@ -4794,10 +4802,8 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, > /* Kept only for backward compatibility purpose. */ > nor->quad_enable = spansion_quad_enable; > > - /* Parse the Serial Flash Discoverable Parameters table. */ > - ret = spi_nor_init_params(nor, ¶ms); > - if (ret) > - return ret; > + /* Init flash parameters based on flash_info struct and SFDP */ > + spi_nor_init_params(nor, ¶ms); > > if (!mtd->name) > mtd->name = dev_name(dev);