Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4242592ybg; Tue, 29 Oct 2019 04:22:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwUJsO0UYN5UCLB4E9CvIdSgKbjS7cpmcSaJuuTNiqJ22Bo4og3KjggD7gS8cctBFN/vF/9 X-Received: by 2002:a17:906:7e12:: with SMTP id e18mr2658707ejr.300.1572348155283; Tue, 29 Oct 2019 04:22:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1572348155; cv=pass; d=google.com; s=arc-20160816; b=ugh4S3lumgNXq8LGZmFchwRCbpB3G2oSG0CBe/Q6Q4VJ0Yh5NSEttIyM7tzqhfbvKB sirb/UN8dDoagLvyTgsNCUNEnqDvZH5ku/XOm7Ch+K9En20eaPiFEW3CKPbhoTMSlnJc kiqDZC6XQQn8bmg0A+o/ynyyyG3iNJfHIbJW7dseKQ3LqCu3fXTnbaffugnD3dpYkdD4 a32ycfFBjMbgexTqKyB13P1va+T0d8i87iTljrvpzdgAIdmvP0IqZqWKIihCb/lUToci P5OS2isT/jKQJ4l4+S9QhVQlMEOu8ecKA0pkvoo9yFINssG6DItrS/CAJC4Jwwn2uG5C 2goQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :ironport-sdr; bh=Na2hcSIN/EfifZeVv/rJEDFq0lI1t9iM7LTcTfFCuyQ=; b=ejpn2o9QfsObVDHQdR+0fiOp8SFRraWalwY33S/xEWwjeKmFEyWvCF7ItsTfnaJMnO UNs+chD/M4hgkiLQHlBanNMrAS5RH2dAWq8kdJAS1qP54zO6EiVKXxt8YvTtuPgOoOcF 2OzuTuorYuSFSUW2MyuDiVJ3QzNUPtOav8q3uzH9/ipsun6NNsosSI/LqBblduQ4lGA+ Pe9syoenVDVhBkmq7Gj65Pq/9Im+u2rHy8CIwKKCkS13J/WlQAQbNNLqr7HX7PX6VJAP qflJv3ICA++QoiUQv7ZONzQRxDeUHTRxPOxj9SjiVJYPjCB9nMelxE0sqzXjP5TyCU8+ IPjA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@microchiptechnology.onmicrosoft.com header.s=selector2-microchiptechnology-onmicrosoft-com header.b=PpOgIdKB; arc=pass (i=1 spf=pass spfdomain=microchip.com dkim=pass dkdomain=microchip.com dmarc=pass fromdomain=microchip.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m2si10452289edf.309.2019.10.29.04.22.12; Tue, 29 Oct 2019 04:22:35 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@microchiptechnology.onmicrosoft.com header.s=selector2-microchiptechnology-onmicrosoft-com header.b=PpOgIdKB; arc=pass (i=1 spf=pass spfdomain=microchip.com dkim=pass dkdomain=microchip.com dmarc=pass fromdomain=microchip.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732767AbfJ2LRH (ORCPT + 99 others); Tue, 29 Oct 2019 07:17:07 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:36086 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732665AbfJ2LRF (ORCPT ); Tue, 29 Oct 2019 07:17:05 -0400 Received-SPF: Pass (esa5.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=esa5.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 (esa5.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa5.microchip.iphmx.com; spf=Pass smtp.mailfrom=Tudor.Ambarus@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: QISfS7EyB20QQWblJoxl3cexJZIxEcYNDFofgVzUKk+tr4V0NmQDsKfiCy+IMYK8na5ySIvRr5 RsXPX1UzvjEDTbJ2Ty7Rwj4HSTslQaUF3N0rCsNrnrWl1Qu+DzF7P4RQKOkOpyJo2I9fLoP72m xIjXaD1oUQdWvBjD53TlbKlFj+xGTqQlRbAr+I3ryXTBoMQfB05yABOOBrh4t1Xgmi/kiGJC/a fc57pUoga+0A1eodTIsezn2vW/Kv1iQsCYt9qPPvGcxCIbOr9/+ITSUXkBBxBuiNB/k6JEKkHL NYo= X-IronPort-AV: E=Sophos;i="5.68,243,1569308400"; d="scan'208";a="53292019" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 29 Oct 2019 04:17:04 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 29 Oct 2019 04:17:03 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 29 Oct 2019 04:17:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V0rObFHcvlQXsA2Q9nSNCP4/SB2Zl+QI9nYyZTFIabhPFhW2QGb+QvoYYwL0G1GN12t1FngQNpPIyVYDZG2f+OsR6dJ9519OUL709MZIEeVB2T9HYUf7izaEvD826UiDDTh7cWncSoy5JNpoFLG/fRAL/Rsefeq2NR2AghvfDzO9kb4VCCNqVRD9hB3MNGC8tG7uHAh8cK0BiMQhmgiLJQuwbCe3H0XiweuNYuPtNWUngGzDAaWXcJyrsHaEMJxIWDkyTePnaVKeZsm5kQ3Je1K3RqytBJgpfBkteH4ir9FCFUQdq9kVkir4d+8M8ypIwI27v1IgMn7yK2wzOghzmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Na2hcSIN/EfifZeVv/rJEDFq0lI1t9iM7LTcTfFCuyQ=; b=aFIfcRDiMAg9xGm6u1hTKZafXd9jH+N1te7FpkjbI7CYPr4yq/KrTcfYjEH6sR0q/Ci0flSnHSrdZ4b4KhQD4at1/aFVc8VSxj+RWE9FTqf4ae/i6qGr2LOlJ/2cEA9euo5Yl3Z30FP5xeZdSuN12vh7LWrofV6V806yKTIa1DIld8xClpvB7RmI8bc+SEogx0lYz2Se09PzvB7Oot05ZsBwKh6k0tBLUH1z62MGFq4SoYpu7qu6zLJi6dhOZeNb/MR78U4VJh0VQLS7rTfGp41vtx1HAlV/KIB61cHp32aDlZihoagvG0M5CH+jtOj+y4CrWdzQzE78uI2pkJHaOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Na2hcSIN/EfifZeVv/rJEDFq0lI1t9iM7LTcTfFCuyQ=; b=PpOgIdKBwdCoU0l0IkBivHazQ9hZOdnoUrQYYUZohMiY174kLsuNGYD4DlK97fb2AzH6KZ5Ftcue7a4yTD59IEvQprincnrxkKBEiY1WjQMXN7qKBv6XYyaIU7ctWOfIG1j1LXWHyk4UUccUHGpChP31CQHD4dd9YRAbe5IBeBw= Received: from MN2PR11MB4448.namprd11.prod.outlook.com (52.135.39.157) by MN2PR11MB3823.namprd11.prod.outlook.com (20.178.254.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2387.20; Tue, 29 Oct 2019 11:17:02 +0000 Received: from MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::c09c:36c8:3301:4457]) by MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::c09c:36c8:3301:4457%5]) with mapi id 15.20.2387.027; Tue, 29 Oct 2019 11:17:02 +0000 From: To: , , , CC: , , Subject: [PATCH v3 09/32] mtd: spi-nor: Pointer parameter for FSR in spi_nor_read_fsr() Thread-Topic: [PATCH v3 09/32] mtd: spi-nor: Pointer parameter for FSR in spi_nor_read_fsr() Thread-Index: AQHVjkpjFsCVETDwxUiEqOeciq1trw== Date: Tue, 29 Oct 2019 11:17:02 +0000 Message-ID: <20191029111615.3706-10-tudor.ambarus@microchip.com> References: <20191029111615.3706-1-tudor.ambarus@microchip.com> In-Reply-To: <20191029111615.3706-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0376.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a3::28) To MN2PR11MB4448.namprd11.prod.outlook.com (2603:10b6:208:193::29) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [83.166.207.93] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 09c2226f-4b0a-4ed9-1439-08d75c6185dc x-ms-traffictypediagnostic: MN2PR11MB3823: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 0205EDCD76 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(346002)(136003)(376002)(396003)(189003)(199004)(478600001)(8676002)(4326008)(8936002)(66066001)(14454004)(36756003)(6512007)(107886003)(86362001)(11346002)(2616005)(476003)(486006)(6436002)(1076003)(2201001)(71200400001)(71190400001)(446003)(81156014)(81166006)(6486002)(50226002)(99286004)(66946007)(386003)(316002)(52116002)(6506007)(102836004)(76176011)(26005)(2501003)(305945005)(186003)(6116002)(110136005)(25786009)(2906002)(256004)(54906003)(3846002)(64756008)(66446008)(66556008)(66476007)(5660300002)(7736002);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB3823;H:MN2PR11MB4448.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: V4OYbXxlAQEpBZpN7ozxEGwzPIt4FR919ydzgkRu8EpAHK4GcbLajZy6uCplddoBzRkl7U1E1y6mjdjn383Pw2eUjqlUw1xgKqaQkHqYXAgQZhLXFH+K/WadWzre5hzxY453RkyOQLlHOkOrphnxUXuA3wIxk3W6WcouKLfI+d7JhvYxdRJaWqQisF8uk0FPsjnQ+znmAd/h8SJXyxlvavBCVZhwBu/Sen1e/onIbmkJcvk3Nn1CUyOdXtgJD69W/6HsmIXHP7ABslOr5RiXElLT/nmcNdqwl0E6Sh7wU2EUErqDwGMe2WhvX30WgKys667g6iUsCF4k1VQzFh6ugYEme7qheud73uNFZd9S/Cq0jbJ2s27CgM3CP3PgJxw495M9QXTqg9hnuNWkuL+DKNDay27TGxewzKqZ+BS4Vt/+cOJVm22cfeTdnkQ7PIxq Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 09c2226f-4b0a-4ed9-1439-08d75c6185dc X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Oct 2019 11:17:02.5389 (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: lbiMdQhLDLAh6mWYPD5ZN+LzpxtsQrEel03xreQjRhD4oNzcIkpbfPUsVFoF1gn0V7GTorFuKw+BHpZ3oZcRr4CIvJqSmYUHuKSSpEbl9PI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3823 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tudor Ambarus Let the callers pass the pointer to the DMA-able buffer where the value of the Flag Status Register will be written. This way we avoid the casts between int and u8, which can be confusing. Caller stops compare the return value of spi_nor_read_fsr() with negative, spi_nor_read_fsr() returns 0 on success and -errno otherwise. Signed-off-by: Tudor Ambarus --- drivers/mtd/spi-nor/spi-nor.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index dc44d1206f77..0d38aede4de7 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -456,12 +456,15 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *s= r) return ret; } =20 -/* - * Read the flag status register, returning its value in the location - * Return the status register value. - * Returns negative if error occurred. +/** + * spi_nor_read_fsr() - Read the Flag Status Register. + * @nor: pointer to 'struct spi_nor' + * @fsr: pointer to a DMA-able buffer where the value of the + * Flag Status Register will be written. + * + * Return: 0 on success, -errno otherwise. */ -static int spi_nor_read_fsr(struct spi_nor *nor) +static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) { int ret; =20 @@ -470,20 +473,18 @@ static int spi_nor_read_fsr(struct spi_nor *nor) SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RDFSR, 1), SPI_MEM_OP_NO_ADDR, SPI_MEM_OP_NO_DUMMY, - SPI_MEM_OP_DATA_IN(1, nor->bouncebuf, 1)); + SPI_MEM_OP_DATA_IN(1, fsr, 1)); =20 ret =3D spi_mem_exec_op(nor->spimem, &op); } else { ret =3D nor->controller_ops->read_reg(nor, SPINOR_OP_RDFSR, - nor->bouncebuf, 1); + fsr, 1); } =20 - if (ret) { + if (ret) dev_err(nor->dev, "error %d reading FSR\n", ret); - return ret; - } =20 - return nor->bouncebuf[0]; + return ret; } =20 /* @@ -705,17 +706,18 @@ static int spi_nor_clear_fsr(struct spi_nor *nor) =20 static int spi_nor_fsr_ready(struct spi_nor *nor) { - int fsr =3D spi_nor_read_fsr(nor); - if (fsr < 0) - return fsr; + int ret =3D spi_nor_read_fsr(nor, &nor->bouncebuf[0]); + + if (ret) + return ret; =20 - if (fsr & (FSR_E_ERR | FSR_P_ERR)) { - if (fsr & FSR_E_ERR) + if (nor->bouncebuf[0] & (FSR_E_ERR | FSR_P_ERR)) { + if (nor->bouncebuf[0] & FSR_E_ERR) dev_err(nor->dev, "Erase operation failed.\n"); else dev_err(nor->dev, "Program operation failed.\n"); =20 - if (fsr & FSR_PT_ERR) + if (nor->bouncebuf[0] & FSR_PT_ERR) dev_err(nor->dev, "Attempted to modify a protected sector.\n"); =20 @@ -723,7 +725,7 @@ static int spi_nor_fsr_ready(struct spi_nor *nor) return -EIO; } =20 - return fsr & FSR_READY; + return nor->bouncebuf[0] & FSR_READY; } =20 static int spi_nor_ready(struct spi_nor *nor) --=20 2.9.5