From patchwork Wed Jul 27 09:37:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2262 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B7E853F330 for ; Wed, 27 Jul 2022 11:37:53 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id s17-20020a056402521100b0043ade613038sf10456138edd.17 for ; Wed, 27 Jul 2022 02:37:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658914673; cv=pass; d=google.com; s=arc-20160816; b=uU4fsW2Qpo8irfwoqyLPsQFcJMWzDRvUQoeE/cg3mV9GVHh2CCcXKsHz4IDGQBxo1k QjRs8d4ibHol+o9TF9sOAzTsbdn8OQxxZX40aozp8I2WQjAcx/Wd9+H0HQ0tvj4eE0u/ 4KtMZBmEGVrxE3LlhoB9dMZ1He/S7+UIRjXkkI1nzhIZGuroGCMu7NYI6PXXl+2k9SbK qQiufwLyKP7tPC+4bAoK6/MH14bDJOGgubd/Ob7QB7H5IS890IB9Cdzoktk6TSLtIxrY Xw6Why4+WgOHIRhyNrwtOIk9BZCj7vxC3/j5fNRYAEtu3rujhFsYEXMaer5bkxu+k7n8 ljLg== 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:to:from:dkim-signature; bh=2tbxa91Yh0yPwEX15BYzd1dsBsVx02OnGcAhzxd5NOc=; b=Z4KaXJE8bCTtt/f20QC/ethn8rbkJzYMy43ALwLK/XFm1k7s9SVmkzkDXIX40MXbNd keYxauac0cvi38qH0jhHf/2VPRKMmHfPN9U4jQqLSvuNBEMyjbTxU2JZX7oVnH08H9xK Wrh4m58tJvsSPrqawOBENM14tmrapMGcWuTI/Nj1GM/XYzFNTfBjz5VNhReIpMMMG0Qr Q1URsbp6WZf3o8lYFCxWrawFaV0EuMEBbRj8GatcMMr2OB3Ex22gGTbh9mJQGbI0PxMe UxbfnJjbOHi8S28b31fTkzfgt4HzjnA2pzJNWdX6aJhl94CEbsUSH0aieDfTvsCtcSst QLfw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jmeQOnnq; 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: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=RAYOEC0oF81I4YcukxwIE/NxXYGu3yzTLtSYY0RDogRFK/gi3r5yaQ3U4XUl+iVwf+ 0jmYYJzpEwYRXZS0y3CWklgWcre60nMAL8zb+RdtHUzKXGe0WZwzsRnnRXA/BQtygFo0 YoOwcQZa5R9ZAjG7Flk8lcdVda3oqkgXuWCLc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to: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=JSxrI6d+hhHUKD4ePTVjO257E1KQZD8+VtJP9Ag8x8qeEHvfjQnOCm33ILd6th4zMF FbRyJgPfmVddiv7Qklgy5Uhsnm52wd4XIG55lv97gfcyMbgczsTtVw8ZaBJyhIrD95WS RiufpV2p344UyJopKd8JolOKGWHQMJdIzGo5rqtnLMM5XnzLd9q94ldG73qPg56tVobs CADBV0B0RJXGFi18KUmNTXehkLK9xdEBgpeRy3qkfzFmWZqbXdw1C/ZjNDgqp9+lK1lq niXbOuCzHB4YTs6iFzdrrTfYiP/H4K/WnnQm0q2Ll5xHbfgLJXdrXLB401k/1iIDAiyv 4EfQ== X-Gm-Message-State: AJIora+XP91iIHgOd+d/CqIr1CK7WDlm1Nxw2Pac6R1dfpuPLOrL9fTA c9CzTuZy24ZMBjX5QBi5M0jUOvij X-Google-Smtp-Source: AGRyM1s4mTvfdtReMKa5qPk2jdkpAd8TOHQ+DrpeA0MlfOpEwDi5Ll7dBMmk7xdqlqotxeNhEkeLRg== X-Received: by 2002:a17:907:d08:b0:72f:b107:c07a with SMTP id gn8-20020a1709070d0800b0072fb107c07amr17291628ejc.340.1658914673480; Wed, 27 Jul 2022 02:37:53 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:40c6:b0:43a:7c1c:8981 with SMTP id z6-20020a05640240c600b0043a7c1c8981ls314017edb.0.-pod-prod-gmail; Wed, 27 Jul 2022 02:37:52 -0700 (PDT) X-Received: by 2002:a05:6402:b72:b0:43c:81c2:dd3f with SMTP id cb18-20020a0564020b7200b0043c81c2dd3fmr6017573edb.19.1658914672142; Wed, 27 Jul 2022 02:37:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658914672; cv=none; d=google.com; s=arc-20160816; b=DLavDGPjNV7L073fIYC/I7EW36Nqvv7UmHRTXOna3G6cigKpRSahN9kpHfI0OZWNeI 5ksFUjO3PQ5WUvDlNpzuX10FMm34MoBd29nY0UlG8NXZcHBhw+8z+sVFA/C6fJOOChxq bMV6lZhKD3YVoM4MMwqV1YAXE3bbCuoaXcokbo7/Gpd9okFvzBBl3Mos4dKiHUuUZG1j rFGGozM1PyApgKRgJWcxJKLIEy/os10u3/EUY7luz6u/j4F8fyK6VsgyUC1azwcFn0Yz kuKzQnluSSzYhoN8AU+rRQHXR8EcYb7srLm1c2tTrXczj4VMLr9mHsigjZBu6z7DFoWn prig== 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:to:from:dkim-signature; bh=tk8uGCl/AQK6CR0J7gwTH8fpzG0EUmFDf2etUFxcmfk=; b=tqNKiIRAJSQZGIWrR6PJWbtZmkGTp6Wzz2sFMHcR7ELeuSaloKZ0vDkJd9xTPIR5aU /Kw/pI51V4U6vSyQU3ZMADqHQ0wLotgbkDPqV/CyDthmW23JV9BmeQF7yBpXtJ+9mmYy grky64FBVevdvSNIjmJ5z95JDUTBpyNt+18pKKmlIG9/35No6APcpIyNVjJlHFZgVWTG loA0CB/Z3miYCZBhSyFHqXXA2NJ3Jsg51I76xwrvle9uzF2JZ03iUGcO/TGnMW6NiHUi UcYBbC0tS2g8Xf5IIMbBn2ZUPnOOBQS9AozXHygXe4yn6i3ehc+Thbu9fCweve5ldeMz p/2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jmeQOnnq; 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 o12-20020a50c90c000000b0043983c28330sor8007960edh.67.2022.07.27.02.37.52 for (Google Transport Security); Wed, 27 Jul 2022 02:37:52 -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:a05:6402:2804:b0:439:83c2:8be2 with SMTP id h4-20020a056402280400b0043983c28be2mr22056123ede.292.1658914671655; Wed, 27 Jul 2022 02:37:51 -0700 (PDT) Received: from panicking.amarulasolutions.com (mob-37-181-33-55.net.vodafone.it. [37.181.33.55]) by smtp.gmail.com with ESMTPSA id q22-20020a17090676d600b006fece722508sm7317678ejn.135.2022.07.27.02.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 02:37:51 -0700 (PDT) From: Michael Trimarchi To: dario.binacchi@amarulasolutions.com, Tommaso Merciai , linux-amarula@amarulasolutions.com Subject: [PATCH 1/7] mtd: nand: Rename the nand_manufacturers struct Date: Wed, 27 Jul 2022 11:37:42 +0200 Message-Id: <20220727093748.1415135-2-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220727093748.1415135-1-michael@amarulasolutions.com> References: <20220727093748.1415135-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=jmeQOnnq; 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;