From patchwork Tue Apr 23 10:46:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clark Wang X-Patchwork-Id: 10912757 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 C4277112C for ; Tue, 23 Apr 2019 10:46:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B381028806 for ; Tue, 23 Apr 2019 10:46:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A64CB2882C; Tue, 23 Apr 2019 10:46:30 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 4013D28806 for ; Tue, 23 Apr 2019 10:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727461AbfDWKq2 (ORCPT ); Tue, 23 Apr 2019 06:46:28 -0400 Received: from mail-eopbgr00049.outbound.protection.outlook.com ([40.107.0.49]:29070 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727504AbfDWKq2 (ORCPT ); Tue, 23 Apr 2019 06:46:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qrfg9MidvALwNhszPgwQhtMWz5vUUsbMcyPEP6uOPRM=; b=ctO8sNKYv05hLXgBIjhLDV0fcDgjvbFZq/vBaV5tXCQJ9XiD2ddhWIS7PWqWTx+m3DpwWdF5zBFeKCrT7FV/9K2Ng5KArNS/9vUS0JoH9uWUc7wangPWG0+EjhKVr25upV9cE1FNoq5TVfnVOM20QC/wRhXCJobe2ZEGdvJm3KI= Received: from AM6PR04MB5016.eurprd04.prod.outlook.com (20.177.34.88) by AM6PR04MB4901.eurprd04.prod.outlook.com (20.177.33.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.14; Tue, 23 Apr 2019 10:46:24 +0000 Received: from AM6PR04MB5016.eurprd04.prod.outlook.com ([fe80::b953:a9de:d0bf:7159]) by AM6PR04MB5016.eurprd04.prod.outlook.com ([fe80::b953:a9de:d0bf:7159%5]) with mapi id 15.20.1813.017; Tue, 23 Apr 2019 10:46:24 +0000 From: Clark Wang To: "broonie@kernel.org" CC: "linux-spi@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 3/3] spi: lpspi: remove fsl_lpspi->chipselect Thread-Topic: [PATCH 3/3] spi: lpspi: remove fsl_lpspi->chipselect Thread-Index: AQHU+cHL/I8KHu5KYE69/PerGlL+Cg== Date: Tue, 23 Apr 2019 10:46:24 +0000 Message-ID: <20190423104649.24483-4-xiaoning.wang@nxp.com> References: <20190423104649.24483-1-xiaoning.wang@nxp.com> In-Reply-To: <20190423104649.24483-1-xiaoning.wang@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: KU1PR03CA0048.apcprd03.prod.outlook.com (2603:1096:802:19::36) To AM6PR04MB5016.eurprd04.prod.outlook.com (2603:10a6:20b:9::24) x-mailer: git-send-email 2.17.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=xiaoning.wang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2f5b74d6-b1df-4918-dcef-08d6c7d8edde x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020);SRVR:AM6PR04MB4901; x-ms-traffictypediagnostic: AM6PR04MB4901: x-microsoft-antispam-prvs: x-forefront-prvs: 0016DEFF96 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(39860400002)(346002)(376002)(366004)(396003)(199004)(189003)(26005)(186003)(66066001)(102836004)(11346002)(6506007)(386003)(2616005)(14444005)(486006)(316002)(76176011)(476003)(52116002)(446003)(256004)(2351001)(2906002)(66946007)(73956011)(86362001)(6116002)(3846002)(99286004)(36756003)(66446008)(66556008)(66476007)(64756008)(54906003)(5660300002)(71200400001)(50226002)(478600001)(71190400001)(305945005)(8676002)(2501003)(6512007)(8936002)(6436002)(68736007)(1730700003)(81156014)(25786009)(81166006)(6916009)(4326008)(14454004)(5640700003)(1076003)(53936002)(6486002)(97736004)(7736002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR04MB4901;H:AM6PR04MB5016.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: J1ixT+dNlqg3aOw1LIfCjiEXsFwLZly2luBqF1XjwXkeWMzyK8MDUZcH+iNntzJ7EwRYEM9Y3dcncHuF9yizA/Kh3+J3LMYgEEozbWoaDNB/EMRXZcT9GgS9L1mnd9unYPXM/3tA++aM1ejLlJi7GCBQjY7h7UT6iDNfLUUJbwUPA44994ySwMEwISySrtyuz88LrHPsN1Q7r65fFyLx7I3VF3f5dZm4IbZBWku9ew1QdhPmLvZeZgQkxLztZ+CctD8zIpiDqEsE1mmNB0aw7kSmaHMWK28luzADv0WhFqgM6C0jsXsiKnkARFp2aiI278OyQroCu2Av3u+IzpHA8oFxvt7cb16asN5VEw/neNdmv33RKJl2chKBy0Ftmm3XyRnvOywwwiUdNb+jWJx53Xy+kI1w2HIf+yvRPYHEFSs= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f5b74d6-b1df-4918-dcef-08d6c7d8edde X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2019 10:46:24.6809 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4901 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 Replace fsl_lpspi->chipselect by controller->cs_gpios. Clean up the code. Signed-off-by: Clark Wang Acked-by: Fugang Duan --- drivers/spi/spi-fsl-lpspi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index a8e83cb96f61..aa6218cbc9e8 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -124,8 +124,6 @@ struct fsl_lpspi_data { bool usedma; struct completion dma_rx_completion; struct completion dma_tx_completion; - - int chipselect[0]; }; static const struct of_device_id fsl_lpspi_dt_ids[] = { @@ -230,10 +228,8 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller) static int fsl_lpspi_prepare_message(struct spi_controller *controller, struct spi_message *msg) { - struct fsl_lpspi_data *fsl_lpspi = - spi_controller_get_devdata(controller); struct spi_device *spi = msg->spi; - int gpio = fsl_lpspi->chipselect[spi->chip_select]; + int gpio = controller->cs_gpios[spi->chip_select]; if (gpio_is_valid(gpio)) gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH ? 0 : 1); @@ -877,6 +873,9 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->dev = &pdev->dev; fsl_lpspi->is_slave = is_slave; + controller->cs_gpios = devm_kzalloc(&controller->dev, + sizeof(int) * controller->num_chipselect, GFP_KERNEL); + if (!fsl_lpspi->is_slave) { for (i = 0; i < controller->num_chipselect; i++) { int cs_gpio = of_get_named_gpio(np, "cs-gpios", i); @@ -884,19 +883,18 @@ static int fsl_lpspi_probe(struct platform_device *pdev) if (!gpio_is_valid(cs_gpio) && lpspi_platform_info) cs_gpio = lpspi_platform_info->chipselect[i]; - fsl_lpspi->chipselect[i] = cs_gpio; + controller->cs_gpios[i] = cs_gpio; if (!gpio_is_valid(cs_gpio)) continue; ret = devm_gpio_request(&pdev->dev, - fsl_lpspi->chipselect[i], + controller->cs_gpios[i], DRIVER_NAME); if (ret) { dev_err(&pdev->dev, "can't get cs gpios\n"); goto out_controller_put; } } - controller->cs_gpios = fsl_lpspi->chipselect; controller->prepare_message = fsl_lpspi_prepare_message; }