Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa1.microchip.iphmx.com: domain of
  Tudor.Ambarus@microchip.com designates 198.175.253.82 as
  permitted sender) identity=mailfrom;
  client-ip=198.175.253.82; receiver=esa1.microchip.iphmx.com;
  envelope-from="Tudor.Ambarus@microchip.com";
  x-sender="Tudor.Ambarus@microchip.com";
  x-conformance=spf_only; x-record-type="v=spf1";
  x-record-text="v=spf1 mx a:ushub1.microchip.com
  a:smtpout.microchip.com a:mx1.microchip.iphmx.com
  a:mx2.microchip.iphmx.com include:servers.mcsv.net
  include:mktomail.com include:spf.protection.outlook.com ~all"
Received-SPF: None (esa1.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa1.microchip.iphmx.com;
  envelope-from="Tudor.Ambarus@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: qQ5cWc+eRKzGyOF/pF6m+IUy/qq+PNF/cp6lgRid/BtBQoB+SjkN4zQMhO1eq7QIsyBZtq7Eaj
 8Y0kqOYUFvl6YYCw0058vIfC5y/xXhZQdONZGE71focu6FCD/waQo6LqwnPrw44IrNXP3U3+gA
 Jzvupv3WxS5bq28THuPZf2o0lW2wLY7Obkp2d2eGxNnbBmMlDkrWO5D9ufiF+vm3dNifgY1Jfr
 r8RZRl6jy7qp1SxFCgzfVGJPfC5znFO09obNInHd/0TvTVhLuMVYyKKjYSp05XnoinCuBExq0V
 eH0=
From:   <Tudor.Ambarus@microchip.com>
To:     <boris.brezillon@collabora.com>, <marek.vasut@gmail.com>,
        <vigneshr@ti.com>
CC:     <dwmw2@infradead.org>, <computersforpeace@gmail.com>,
        <miquel.raynal@bootlin.com>, <richard@nod.at>,
        <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
        <Tudor.Ambarus@microchip.com>
Subject: [PATCH 3/3] mtd: spi-nor: Introduce spi_nor_get_flash_info()
Thread-Topic: [PATCH 3/3] mtd: spi-nor: Introduce spi_nor_get_flash_info()
Thread-Index: AQHVR4D2dVyQUM7xR0KDZRbhf1XpYg==
Date:   Wed, 31 Jul 2019 09:18:49 +0000
Message-ID: <20190731091835.27766-4-tudor.ambarus@microchip.com>
References: <20190731091835.27766-1-tudor.ambarus@microchip.com>
In-Reply-To: <20190731091835.27766-1-tudor.ambarus@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.9.5
x-originating-ip: [94.177.32.154]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 3b743723-9d7f-4713-43c4-08d7159818e7
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020);SRVR:MN2PR11MB3680;
x-ms-traffictypediagnostic: MN2PR11MB3680:
x-microsoft-antispam-prvs: <MN2PR11MB3680C945F88859442FAB5008F0DF0@MN2PR11MB3680.namprd11.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:517;
x-forefront-prvs: 011579F31F
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(366004)(39860400002)(346002)(376002)(136003)(199004)(189003)(8676002)(81166006)(4326008)(81156014)(53936002)(7736002)(256004)(25786009)(68736007)(8936002)(50226002)(14444005)(478600001)(6486002)(11346002)(2906002)(107886003)(14454004)(2501003)(102836004)(86362001)(6436002)(71190400001)(71200400001)(476003)(1076003)(305945005)(5660300002)(66556008)(66476007)(64756008)(66946007)(2201001)(66446008)(36756003)(486006)(3846002)(99286004)(76176011)(6512007)(6506007)(66066001)(386003)(446003)(316002)(6116002)(26005)(54906003)(186003)(110136005)(52116002)(2616005);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB3680;H:MN2PR11MB4448.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 66WROcukXeSIqSC55CS/6ch9eNkJlDHKIowqmUEJ2nEL/oJ9I0XlzWDZUQDT9GHUyE4LqkAZ9eYA7oIqN7ZzyKWOr4jJo1HRsGb1RfBSgrwG5Jtg7BAzPNpZ6grTipO92r4l3ZTH2VBx53pIXgQsrpqNFKuPS4R264QO4ekjkU95JUVhKFxEAnb70o+kSxt/LNTqk1ybG+8Ury1DivcSI60mqjOM1/xlm37ZGdU6NZU67mlT1vJlO7R/VZgtj9vapM/3uCR9CzZyoN8lNtrWZoGxfFOwljA6LG6S3hAvEkg621XuEyA6Aneaw3ef2m6ppFf+7y5TQD4NhBCfbdtPyzgBEBTxylKF43x3ktwcwZKey0ky8alGpql/0Eo2Pls5IChEoLtELIVyJkLo6jNO6FmWTWxtujmOAMED0oPu6Lw=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 3b743723-9d7f-4713-43c4-08d7159818e7
X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jul 2019 09:18:49.4587
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: tudor.ambarus@microchip.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3680
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Tudor Ambarus <tudor.ambarus@microchip.com>

Dedicate a function for getting the pointer to the flash_info
const struct. Trim a bit the spi_nor_scan() huge function.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 52 ++++++++++++++++++++++++++-------------=
----
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index c322d7cd8216..636f065cc869 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -4800,25 +4800,10 @@ static int spi_nor_set_addr_width(struct spi_nor *n=
or)
 	return 0;
 }
=20
-int spi_nor_scan(struct spi_nor *nor, const char *name,
-		 const struct spi_nor_hwcaps *hwcaps)
+static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor=
,
+						       const char *name)
 {
-	struct spi_nor_flash_parameter params;
 	const struct flash_info *info =3D NULL;
-	struct device *dev =3D nor->dev;
-	struct mtd_info *mtd =3D &nor->mtd;
-	struct device_node *np =3D spi_nor_get_flash_node(nor);
-	int ret;
-	int i;
-
-	ret =3D spi_nor_check(nor);
-	if (ret)
-		return ret;
-
-	/* Reset SPI protocol for all commands. */
-	nor->reg_proto =3D SNOR_PROTO_1_1_1;
-	nor->read_proto =3D SNOR_PROTO_1_1_1;
-	nor->write_proto =3D SNOR_PROTO_1_1_1;
=20
 	if (name)
 		info =3D spi_nor_match_id(name);
@@ -4826,7 +4811,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *nam=
e,
 	if (!info)
 		info =3D spi_nor_read_id(nor);
 	if (IS_ERR_OR_NULL(info))
-		return -ENOENT;
+		return ERR_PTR(-ENOENT);
=20
 	/*
 	 * If caller has specified name of flash model that can normally be
@@ -4837,7 +4822,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *nam=
e,
=20
 		jinfo =3D spi_nor_read_id(nor);
 		if (IS_ERR(jinfo)) {
-			return PTR_ERR(jinfo);
+			return jinfo;
 		} else if (jinfo !=3D info) {
 			/*
 			 * JEDEC knows better, so overwrite platform ID. We
@@ -4846,12 +4831,39 @@ int spi_nor_scan(struct spi_nor *nor, const char *n=
ame,
 			 * marked read-only, and we don't want to lose that
 			 * information, even if it's not 100% accurate.
 			 */
-			dev_warn(dev, "found %s, expected %s\n",
+			dev_warn(nor->dev, "found %s, expected %s\n",
 				 jinfo->name, info->name);
 			info =3D jinfo;
 		}
 	}
=20
+	return info;
+}
+
+int spi_nor_scan(struct spi_nor *nor, const char *name,
+		 const struct spi_nor_hwcaps *hwcaps)
+{
+	struct spi_nor_flash_parameter params;
+	const struct flash_info *info;
+	struct device *dev =3D nor->dev;
+	struct mtd_info *mtd =3D &nor->mtd;
+	struct device_node *np =3D spi_nor_get_flash_node(nor);
+	int ret;
+	int i;
+
+	ret =3D spi_nor_check(nor);
+	if (ret)
+		return ret;
+
+	/* Reset SPI protocol for all commands. */
+	nor->reg_proto =3D SNOR_PROTO_1_1_1;
+	nor->read_proto =3D SNOR_PROTO_1_1_1;
+	nor->write_proto =3D SNOR_PROTO_1_1_1;
+
+	info =3D spi_nor_get_flash_info(nor, name);
+	if (IS_ERR(info))
+		return PTR_ERR(info);
+
 	nor->info =3D info;
=20
 	mutex_init(&nor->lock);
--=20
2.9.5