hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/spi/spi-pic32-sqi.c
....@@ -1,17 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * PIC32 Quad SPI controller driver.
34 *
45 * Purna Chandra Mandal <purna.mandal@microchip.com>
56 * Copyright (c) 2016, Microchip Technology Inc.
6
- *
7
- * This program is free software; you can distribute it and/or modify it
8
- * under the terms of the GNU General Public License (Version 2) as
9
- * published by the Free Software Foundation.
10
- *
11
- * This program is distributed in the hope it will be useful, but WITHOUT
12
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14
- * for more details.
157 */
168
179 #include <linux/clk.h>
....@@ -466,9 +458,9 @@
466458 int i;
467459
468460 /* allocate coherent DMAable memory for hardware buffer descriptors. */
469
- sqi->bd = dma_zalloc_coherent(&sqi->master->dev,
470
- sizeof(*bd) * PESQI_BD_COUNT,
471
- &sqi->bd_dma, GFP_DMA32);
461
+ sqi->bd = dma_alloc_coherent(&sqi->master->dev,
462
+ sizeof(*bd) * PESQI_BD_COUNT,
463
+ &sqi->bd_dma, GFP_KERNEL);
472464 if (!sqi->bd) {
473465 dev_err(&sqi->master->dev, "failed allocating dma buffer\n");
474466 return -ENOMEM;
....@@ -578,7 +570,6 @@
578570 {
579571 struct spi_master *master;
580572 struct pic32_sqi *sqi;
581
- struct resource *reg;
582573 int ret;
583574
584575 master = spi_alloc_master(&pdev->dev, sizeof(*sqi));
....@@ -588,8 +579,7 @@
588579 sqi = spi_master_get_devdata(master);
589580 sqi->master = master;
590581
591
- reg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
592
- sqi->regs = devm_ioremap_resource(&pdev->dev, reg);
582
+ sqi->regs = devm_platform_ioremap_resource(pdev, 0);
593583 if (IS_ERR(sqi->regs)) {
594584 ret = PTR_ERR(sqi->regs);
595585 goto err_free_master;
....@@ -598,7 +588,6 @@
598588 /* irq */
599589 sqi->irq = platform_get_irq(pdev, 0);
600590 if (sqi->irq < 0) {
601
- dev_err(&pdev->dev, "no irq found\n");
602591 ret = sqi->irq;
603592 goto err_free_master;
604593 }
....@@ -656,7 +645,7 @@
656645 master->max_speed_hz = clk_get_rate(sqi->base_clk);
657646 master->dma_alignment = 32;
658647 master->max_dma_len = PESQI_BD_BUF_LEN_MAX;
659
- master->dev.of_node = of_node_get(pdev->dev.of_node);
648
+ master->dev.of_node = pdev->dev.of_node;
660649 master->mode_bits = SPI_MODE_3 | SPI_MODE_0 | SPI_TX_DUAL |
661650 SPI_RX_DUAL | SPI_TX_QUAD | SPI_RX_QUAD;
662651 master->flags = SPI_MASTER_HALF_DUPLEX;