From patchwork Sat Feb 2 04:07:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 10794083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4DAD317E9 for ; Sat, 2 Feb 2019 04:08:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E04D32D4A for ; Sat, 2 Feb 2019 04:08:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3220A331AF; Sat, 2 Feb 2019 04:08:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BADA532D4A for ; Sat, 2 Feb 2019 04:08:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727604AbfBBEH1 (ORCPT ); Fri, 1 Feb 2019 23:07:27 -0500 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:55646 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727516AbfBBEHY (ORCPT ); Fri, 1 Feb 2019 23:07:24 -0500 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="26219230" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Feb 2019 21:07:23 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.38) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 1 Feb 2019 21:07:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=92djvqjrljFwDc2mR2BUsSiiFrnnqT+LjXGHj5YUxW8=; b=UqAg2BlImYB9hxEJwUVTAYbrgdyAnHLWul3SWIFtJxZ+NyM5+j7+1yQpzeSZC7xOH+dgIs2N3kwr7ErLomoNxUcb4uXgo5epT/EqXCsKAdlqR9CuPP1YvQ90pmE1MIoHmiXCoT6u3EwU9r8sSTlBhExEqwj8MWyK3oX5LxrY7is= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.98.146) by BN6PR11MB1300.namprd11.prod.outlook.com (10.173.26.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Sat, 2 Feb 2019 04:07:22 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::847:4296:13b9:fc9f%8]) with mapi id 15.20.1580.017; Sat, 2 Feb 2019 04:07:22 +0000 From: To: , , , , , , , , CC: , , , , , Subject: [PATCH v3 04/13] spi: atmel-quadspi: fix naming scheme Thread-Topic: [PATCH v3 04/13] spi: atmel-quadspi: fix naming scheme Thread-Index: AQHUuqzMH50aknQd3kGkG3IJcminQA== Date: Sat, 2 Feb 2019 04:07:22 +0000 Message-ID: <20190202040653.1217-5-tudor.ambarus@microchip.com> References: <20190202040653.1217-1-tudor.ambarus@microchip.com> In-Reply-To: <20190202040653.1217-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR09CA0062.eurprd09.prod.outlook.com (2603:10a6:802:28::30) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:101::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [188.25.201.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR11MB1300;6:/icsmTXY2EUWbJNUozqFfFpO0uofqF7SJnkivtnFJrOcBW4ponjnrUYzamo830aqhkHvuveJL6PVuWTTxIGFeQrpw546Pu4E4vT8U1OEDrgYWhM6gZ5E/PaFmxK87OvA7US/5G7mNgPHyRcoiVYHEimd8YmGHAUE+/WUk0lo235lJsSaRt9jdNoobarBNsgeFQPfV1E49jGCfBndwXMKPnXC7jlU5cHiMc0SCWu36PsF0JV8qE/Lx8m/SeNUtpcDURvvfVfXyvNjxvtW9I/UHHr5u1rm5wDrRJCfsnG0HuLAWIvSKXxWu63QCv6r/4qfOkfUnRLfdoRepYFjlJOVc46fiyyuba70ohlCXKjh9rq20x2m+bKivKThK8ih1DXzsgYyfueYhhtnSF1PPQEQmLvZS5o5Rw7ROjp0NNu1BefbY9x/s7W/hazvlhJmQMhDNPRxA7OBmCnfmoOv8sAuSw==;5:zTgf5tJ4RXuvletiqRVGMjtvBJptRsQWLTJlV5MC2/LN86Hnhv5dP+rtzCEs0VqsPoqDESnI1EfV2Zy66lXWeb5vTPO1y9t7u2KnlTqE/F7RDoWIJJXgI3N8+tbbSekMROx336kfw8sQap7MtoYgLdABGktTgf+Htnt4HX4oywpjDgXM+Mmy4TRnf+OJJyh5o5baSlf+/IPcIs6ywzrDqQ==;7:dIt2/oY8i4zh4Dwuj9OTXsp76GqI5EEQs6AkusQIG0EaXhkU5oLdsHzCleYTHCjJFiSaVYwytu5OiqE9CZP+AqMg+yiWXP2TuT1vdgTBwk03pJMH9nCDSPSPP75maM8XomOAHuS/U9iyiwY0AI7puQ== x-ms-office365-filtering-correlation-id: de2d4e66-f3bc-4195-78e4-08d688c3ee4b x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BN6PR11MB1300; x-ms-traffictypediagnostic: BN6PR11MB1300: x-microsoft-antispam-prvs: x-forefront-prvs: 09368DB063 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(366004)(346002)(136003)(396003)(199004)(189003)(14454004)(52116002)(50226002)(105586002)(6436002)(102836004)(72206003)(81156014)(81166006)(2906002)(26005)(7736002)(478600001)(3846002)(6116002)(53936002)(256004)(14444005)(106356001)(8936002)(68736007)(36756003)(97736004)(76176011)(107886003)(4326008)(39060400002)(2616005)(99286004)(476003)(446003)(86362001)(66066001)(71200400001)(11346002)(7416002)(71190400001)(6486002)(6512007)(316002)(110136005)(1076003)(305945005)(186003)(8676002)(2501003)(25786009)(486006)(54906003)(386003)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1300;H:BN6PR11MB1842.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: mddVmu95POtp0xBSQUjULk89Rgw0B9ZpZLNxIKA7CDS89MYsQ4JWe3tMCdL8mZUidYvMahJs68JY92eLPpQnd0m7+nTYvDkGch8Q3132UiUbx7mLuSkyscdKjQUtze7nApvn9+p65Eq3krYdj/f7rso9m9mVBZIrP/N0C0mVTepCzvhH2bcGwHgAU3Nzvkj5P8SXcB7xFhHdMbX8GkEuz1IqUO8j3C97xhRrh8Wv3su0FoO4ZVUOgGdZatL5sF3xZko85qLsfIHPJI8DihqjRcQzwahaeS9VrxdtLgm3obvY16jhENzFyJsNpkUx2fkqaQ8rH4XxyBoz+m7Lvg61t2/xXYcroIZ2xk7va1C2lJmVKrcIYZg7ljwvC2n1HPKkhZs+dMqIzJfsbWq5fKpXlTqvUw+PD7AfzRUOUyYH4qQ= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: de2d4e66-f3bc-4195-78e4-08d688c3ee4b X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2019 04:07:19.6009 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1300 X-OriginatorOrg: microchip.com Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tudor Ambarus Let general names to core drivers. Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon --- v3: no change v2: update after the removing of iomem access wrappers drivers/spi/atmel-quadspi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 131374db0db4..47ed751a91e7 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -158,14 +158,14 @@ struct atmel_qspi { struct completion cmd_completion; }; -struct qspi_mode { +struct atmel_qspi_mode { u8 cmd_buswidth; u8 addr_buswidth; u8 data_buswidth; u32 config; }; -static const struct qspi_mode sama5d2_qspi_modes[] = { +static const struct atmel_qspi_mode sama5d2_qspi_modes[] = { { 1, 1, 1, QSPI_IFR_WIDTH_SINGLE_BIT_SPI }, { 1, 1, 2, QSPI_IFR_WIDTH_DUAL_OUTPUT }, { 1, 1, 4, QSPI_IFR_WIDTH_QUAD_OUTPUT }, @@ -175,8 +175,8 @@ static const struct qspi_mode sama5d2_qspi_modes[] = { { 4, 4, 4, QSPI_IFR_WIDTH_QUAD_CMD }, }; -static inline bool is_compatible(const struct spi_mem_op *op, - const struct qspi_mode *mode) +static inline bool atmel_qspi_is_compatible(const struct spi_mem_op *op, + const struct atmel_qspi_mode *mode) { if (op->cmd.buswidth != mode->cmd_buswidth) return false; @@ -190,12 +190,12 @@ static inline bool is_compatible(const struct spi_mem_op *op, return true; } -static int find_mode(const struct spi_mem_op *op) +static int atmel_qspi_find_mode(const struct spi_mem_op *op) { u32 i; for (i = 0; i < ARRAY_SIZE(sama5d2_qspi_modes); i++) - if (is_compatible(op, &sama5d2_qspi_modes[i])) + if (atmel_qspi_is_compatible(op, &sama5d2_qspi_modes[i])) return i; return -1; @@ -204,7 +204,7 @@ static int find_mode(const struct spi_mem_op *op) static bool atmel_qspi_supports_op(struct spi_mem *mem, const struct spi_mem_op *op) { - if (find_mode(op) < 0) + if (atmel_qspi_find_mode(op) < 0) return false; /* special case not supported by hardware */ @@ -234,7 +234,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) aq->smm = QSPI_MR_SMM; } - mode = find_mode(op); + mode = atmel_qspi_find_mode(op); if (mode < 0) return -ENOTSUPP;