hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/spi/spi-coldfire-qspi.c
....@@ -1,17 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Freescale/Motorola Coldfire Queued SPI driver
34 *
45 * Copyright 2010 Steven King <sfking@fdwdc.com>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
156 */
167
178 #include <linux/kernel.h>
....@@ -348,7 +339,6 @@
348339 {
349340 struct spi_master *master;
350341 struct mcfqspi *mcfqspi;
351
- struct resource *res;
352342 struct mcfqspi_platform_data *pdata;
353343 int status;
354344
....@@ -371,8 +361,7 @@
371361
372362 mcfqspi = spi_master_get_devdata(master);
373363
374
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
375
- mcfqspi->iobase = devm_ioremap_resource(&pdev->dev, res);
364
+ mcfqspi->iobase = devm_platform_ioremap_resource(pdev, 0);
376365 if (IS_ERR(mcfqspi->iobase)) {
377366 status = PTR_ERR(mcfqspi->iobase);
378367 goto fail0;
....@@ -398,7 +387,7 @@
398387 status = PTR_ERR(mcfqspi->clk);
399388 goto fail0;
400389 }
401
- clk_enable(mcfqspi->clk);
390
+ clk_prepare_enable(mcfqspi->clk);
402391
403392 master->bus_num = pdata->bus_num;
404393 master->num_chipselect = pdata->num_chipselect;
....@@ -436,7 +425,7 @@
436425 pm_runtime_disable(&pdev->dev);
437426 mcfqspi_cs_teardown(mcfqspi);
438427 fail1:
439
- clk_disable(mcfqspi->clk);
428
+ clk_disable_unprepare(mcfqspi->clk);
440429 fail0:
441430 spi_master_put(master);
442431
....@@ -455,7 +444,7 @@
455444 mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);
456445
457446 mcfqspi_cs_teardown(mcfqspi);
458
- clk_disable(mcfqspi->clk);
447
+ clk_disable_unprepare(mcfqspi->clk);
459448
460449 return 0;
461450 }