From patchwork Thu Jul 28 17:17:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2282 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 941923F081 for ; Thu, 28 Jul 2022 19:17:52 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id e3-20020adf9bc3000000b0021e50518071sf588838wrc.2 for ; Thu, 28 Jul 2022 10:17:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1659028672; cv=pass; d=google.com; s=arc-20160816; b=IvjIL6nt156+VDj0jCMawDyrCeUi8MBeJ3EZMlz5/N6vEeMrwgtQpLsaDLp3QSasjG JrD0dTzLwD+XVIYguJ6LBfGAER2iDbbt8gk6m52knMK0Y9QcsSiFj6fUpE28Y9REEmSg H7pO9CQFzWO/ysY2saSNlmWE5rCGttuueHAil5dr68V0+xbY3K06qbpDkQyfKE+UTWn7 OUbi6k6k2unzlo+tljHIRaEmqlcaAvs/HT/Lv0EjzeFX1S6CcGEGjlIlHG5b5nI/HOjC COBQLYC15iprXCKFM96eXjYJM5uxGBuwVqyMWg4sEepggaVlbuRbzCC92I9vrnGhCA+r 9SIA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2tbxa91Yh0yPwEX15BYzd1dsBsVx02OnGcAhzxd5NOc=; b=Ht9fPbN2jInQ9aNxCKVuznvehWF2t4SuqL4Hlrap80pd2oqr9ROBCX0TAP8v+X5yzp JZ36d9UmJHhkJk4SOJT7N5GRSxwLF0HygcXMhl1+kINr7jiAZYR0bGRdCBSt2VrmDYGx UtNAxRDI5dtukxjvURiXb1CxeGjamgYVS16myg5SG6J0AoaIKYK8Q5SqjeSsGYII5kjK iO44MrPLDT56GKC9eJvfNICuVORPmge8P7aH0o6X9jV0HH+whPDdyrOrlUTZNDfYgqtn zpS94jKFzF/2acbINRppbdZTZqEFDwBUCcYWVvJMKUXmwKANvvr1/w6lsF+MChWIPcXl Nb1g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUmEvgtR; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=2tbxa91Yh0yPwEX15BYzd1dsBsVx02OnGcAhzxd5NOc=; b=b3s/8OeTZ9DNVi/OEuzJGUqIZnFI+Nthn2sA53IATLVw7QWUAQmaw78up8LCDB8bsI zOLC1Igh11o7I0fHJkqfS1wRdFvFinooxg5OuBBmAZLKN/OxacSNQz3hHijH11CEEf+Q Dqp+VPJYmRAOn3zOCNNzULDI7i4Lk4MrFBzzA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=2tbxa91Yh0yPwEX15BYzd1dsBsVx02OnGcAhzxd5NOc=; b=DhxOVwxhDrUx3PGAS9/vEXY5Jyt5uJ943Z5swHqwVldWg6NuCPvspABzs31kBbYUhM F9oH4dd866aC0KFXdeoFy4MgqLNThoUwURdmHNC1LSFxj89zwmuDb25JWoSq24aNOHOz eFaUD0+YCghhQy66GWP27HlmrLhx8i6PiXHonfRMM45wg89A6fX0t+aFL/wyOScNqEQU aMLY4w3ITwedXScVXGgl9iCFEzsZ0hWUCo3pPZwkCweDg9ILyYHjTEmv4alhz5AvlsbZ mXjMS6oZlEPhHIUBEIWV1yGQMoyL7kVUxwI/nSTuiEuzHIAJtsOn7GD825dwhaMUSN0b hO3Q== X-Gm-Message-State: AJIora8uGYD7no0BkSWxP7OzLMQib+Jdp7KwY9Xvbmjhtx+VAnuC0hOV 1lDbsRUKgnG5GGhoedpLFDd9Rom2 X-Google-Smtp-Source: AGRyM1utfAxx7PyTOQLWoNtVvW7knS3Y9AUa4LqLVVnwwOfpLr/MExHWFHsMEB9rIoPPCe+cUxVHYg== X-Received: by 2002:a5d:674c:0:b0:21e:5135:18cb with SMTP id l12-20020a5d674c000000b0021e513518cbmr18385573wrw.298.1659028672343; Thu, 28 Jul 2022 10:17:52 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:2409:b0:397:d1d5:9b4e with SMTP id 9-20020a05600c240900b00397d1d59b4els838861wmp.3.-pod-control-gmail; Thu, 28 Jul 2022 10:17:51 -0700 (PDT) X-Received: by 2002:a05:600c:5114:b0:3a3:3f7f:27ec with SMTP id o20-20020a05600c511400b003a33f7f27ecmr249654wms.93.1659028670939; Thu, 28 Jul 2022 10:17:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659028670; cv=none; d=google.com; s=arc-20160816; b=U8aKQGzV8a40wRd3X/uMKWRJumM6sH2qZ0I8xiJ1UiqD6qL5vC1lhHydhD7xEEIh7p NgCHYhCMsaavVrGbpsI0xjw8EfNT7K7wQXDUTuRtAjSXssv/REl1Py0DfUEWRshUgJHn OSdy/TWx4TDXdTs+pgy5xCBrwaP2pOWJRQexwawq08TFvLi85oN7KcEOtMXGROLqa1LM JRncrC45JJAfwOK9veqQVbGD9YJqD5uFXjq2ymH4/N6NFB1ixdMpYzV7+7hjcywUbp6f YXjBPU+161NIlJrfDhpCAOnSWrMvzQYUV3V3ooxtP9LVhxaAQrItLdPRkw+6w9Ru2YWw OmIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tk8uGCl/AQK6CR0J7gwTH8fpzG0EUmFDf2etUFxcmfk=; b=mgpW5VLelg+k/nXroOUUxDloXAl1y5Y7z+E3rSKfPOuQPdY8hNhzVTCXhPVZNO4SUF SJeezHrRai63Oio3Ed9GaA5g2DF677JBMTLl4yvBiFRgzQQgYmLR0mXCXmnQN5DxarxQ bpWLkepnRLtj74YTeUX3Z3eJqi2bTfFaMTsi/bQ7GhgLnskeYoZ2XwjfUdJnkvAGVVHY avtZh/6NLDsPdlmk99scHXfagW9gBKWHZN0oQXsl6vvpky1rAKIkNP5/dOcfz5bXCFYm icPDC093yEGdJRbTOAL9ZvIMZb7gwgwQlndImp9r/B7gDFWrw/jIAe4BLMqGrhGTt45/ vWIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUmEvgtR; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id c10-20020a05600c100a00b0039ee95ea2f9sor1465901wmc.31.2022.07.28.10.17.50 for (Google Transport Security); Thu, 28 Jul 2022 10:17:50 -0700 (PDT) Received-SPF: pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a7b:cbd1:0:b0:3a3:187a:296c with SMTP id n17-20020a7bcbd1000000b003a3187a296cmr253382wmi.123.1659028670428; Thu, 28 Jul 2022 10:17:50 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.196.208.4]) by smtp.gmail.com with ESMTPSA id h3-20020a5d4fc3000000b0021eba590ad1sm1667850wrw.90.2022.07.28.10.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 10:17:48 -0700 (PDT) From: Michael Trimarchi To: Dario Binacchi , u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Tommaso Merciai , Patrice Chotard , Wolfgang Denk , Simon Glass Subject: [PATCH 1/5] mtd: nand: Rename the nand_manufacturers struct Date: Thu, 28 Jul 2022 19:17:39 +0200 Message-Id: <20220728171744.1761739-2-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220728171744.1761739-1-michael@amarulasolutions.com> References: <20220728171744.1761739-1-michael@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: michael@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUmEvgtR; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Upstream linux commit 8cfb9ab68f9070. Drop the 's' at the end of nand_manufacturers since the struct is actually describing a single manufacturer, not a manufacturer table. Signed-off-by: Michael Trimarchi --- drivers/mtd/nand/raw/nand_base.c | 4 ++-- drivers/mtd/nand/raw/nand_ids.c | 2 +- include/linux/mtd/rawnand.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 4b09a11288..9d8ccfda53 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4261,7 +4261,7 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, * Returns a nand_manufacturer_desc object if the manufacturer is defined * in the NAND manufacturers database, NULL otherwise. */ -static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id) +static const struct nand_manufacturer *nand_get_manufacturer_desc(u8 id) { int i; @@ -4281,7 +4281,7 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id, struct nand_flash_dev *type) { struct mtd_info *mtd = &chip->mtd; - const struct nand_manufacturers *manufacturer_desc; + const struct nand_manufacturer *manufacturer_desc; int busw, ret; u8 *id_data = chip->id.data; diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index 4dece1b206..d0cfacc69b 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -177,7 +177,7 @@ struct nand_flash_dev nand_flash_ids[] = { }; /* Manufacturer IDs */ -struct nand_manufacturers nand_manuf_ids[] = { +struct nand_manufacturer nand_manuf_ids[] = { {NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops}, {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops}, {NAND_MFR_FUJITSU, "Fujitsu"}, diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index aa45558b3d..8dc2d81dba 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -976,7 +976,7 @@ struct nand_chip { void *priv; struct { - const struct nand_manufacturers *desc; + const struct nand_manufacturer *desc; void *priv; } manufacturer; }; @@ -1124,19 +1124,19 @@ struct nand_flash_dev { }; /** - * struct nand_manufacturers - NAND Flash Manufacturer ID Structure + * struct nand_manufacturer - NAND Flash Manufacturer ID Structure * @name: Manufacturer name * @id: manufacturer ID code of device. * @ops: manufacturer operations */ -struct nand_manufacturers { +struct nand_manufacturer { int id; char *name; const struct nand_manufacturer_ops *ops; }; extern struct nand_flash_dev nand_flash_ids[]; -extern struct nand_manufacturers nand_manuf_ids[]; +extern struct nand_manufacturer nand_manuf_ids[]; extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops; extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;