~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,9 +1,8 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* SPI bus driver for CSR SiRFprimaII
3	4	*
4	5	* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
5		- *
6		- * Licensed under GPLv2 or later.
7	6	*/
8	7
9	8	#include <linux/module.h>
..	..	@@ -1071,7 +1070,6 @@
1071	1070	{
1072	1071	struct sirfsoc_spi *sspi;
1073	1072	struct spi_master *master;
1074		- struct resource *mem_res;
1075	1073	const struct sirf_spi_comp_data *spi_comp_data;
1076	1074	int irq;
1077	1075	int ret;
..	..	@@ -1098,8 +1096,7 @@
1098	1096	sspi->fifo_level_chk_mask = (sspi->fifo_size / 4) - 1;
1099	1097	sspi->dat_max_frm_len = spi_comp_data->dat_max_frm_len;
1100	1098	sspi->fifo_size = spi_comp_data->fifo_size;
1101		- mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1102		- sspi->base = devm_ioremap_resource(&pdev->dev, mem_res);
	1099	+ sspi->base = devm_platform_ioremap_resource(pdev, 0);
1103	1100	if (IS_ERR(sspi->base)) {
1104	1101	ret = PTR_ERR(sspi->base);
1105	1102	goto free_master;
..	..	@@ -1129,16 +1126,16 @@
1129	1126	sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
1130	1127
1131	1128	/* request DMA channels */
1132		- sspi->rx_chan = dma_request_slave_channel(&pdev->dev, "rx");
1133		- if (!sspi->rx_chan) {
	1129	+ sspi->rx_chan = dma_request_chan(&pdev->dev, "rx");
	1130	+ if (IS_ERR(sspi->rx_chan)) {
1134	1131	dev_err(&pdev->dev, "can not allocate rx dma channel\n");
1135		- ret = -ENODEV;
	1132	+ ret = PTR_ERR(sspi->rx_chan);
1136	1133	goto free_master;
1137	1134	}
1138		- sspi->tx_chan = dma_request_slave_channel(&pdev->dev, "tx");
1139		- if (!sspi->tx_chan) {
	1135	+ sspi->tx_chan = dma_request_chan(&pdev->dev, "tx");
	1136	+ if (IS_ERR(sspi->tx_chan)) {
1140	1137	dev_err(&pdev->dev, "can not allocate tx dma channel\n");
1141		- ret = -ENODEV;
	1138	+ ret = PTR_ERR(sspi->tx_chan);
1142	1139	goto free_rx_dma;
1143	1140	}
1144	1141