tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

spi: replace and remove

Merge series from Yang Yingliang <yangyingliang@huaweicloud.com>:

Switch to use {devm_}spi_alloc_host/target() in drivers and remove
{devm_}spi_alloc_master/slave() in spi driver.

Mark Brown 9e3dfbcf b45938ed

+20 -50
+2 -2
Documentation/driver-api/driver-model/devres.rst
··· 462 462 devm_acpi_dma_controller_free() 463 463 464 464 SPI 465 - devm_spi_alloc_master() 466 - devm_spi_alloc_slave() 465 + devm_spi_alloc_host() 466 + devm_spi_alloc_target() 467 467 devm_spi_optimize_message() 468 468 devm_spi_register_controller() 469 469 devm_spi_register_host()
+3 -3
drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
··· 175 175 struct spi_controller *ctlr; 176 176 struct netup_spi *nspi; 177 177 178 - ctlr = devm_spi_alloc_master(&ndev->pci_dev->dev, 179 - sizeof(struct netup_spi)); 178 + ctlr = devm_spi_alloc_host(&ndev->pci_dev->dev, 179 + sizeof(struct netup_spi)); 180 180 if (!ctlr) { 181 181 dev_err(&ndev->pci_dev->dev, 182 - "%s(): unable to alloc SPI master\n", __func__); 182 + "%s(): unable to alloc SPI host\n", __func__); 183 183 return -EINVAL; 184 184 } 185 185 nspi = spi_controller_get_devdata(ctlr);
+2 -2
drivers/media/usb/msi2500/msi2500.c
··· 1219 1219 goto err_free_mem; 1220 1220 } 1221 1221 1222 - /* SPI master adapter */ 1223 - ctlr = spi_alloc_master(dev->dev, 0); 1222 + /* SPI host adapter */ 1223 + ctlr = spi_alloc_host(dev->dev, 0); 1224 1224 if (ctlr == NULL) { 1225 1225 ret = -ENOMEM; 1226 1226 goto err_unregister_v4l2_dev;
+1 -1
drivers/spi/spi-ch341.c
··· 152 152 if (ret) 153 153 return ret; 154 154 155 - ctrl = devm_spi_alloc_master(&udev->dev, sizeof(struct ch341_spi_dev)); 155 + ctrl = devm_spi_alloc_host(&udev->dev, sizeof(struct ch341_spi_dev)); 156 156 if (!ctrl) 157 157 return -ENOMEM; 158 158
+2 -2
drivers/spi/spi-slave-mt27xx.c
··· 388 388 int irq, ret; 389 389 const struct of_device_id *of_id; 390 390 391 - ctlr = spi_alloc_slave(&pdev->dev, sizeof(*mdata)); 391 + ctlr = spi_alloc_target(&pdev->dev, sizeof(*mdata)); 392 392 if (!ctlr) { 393 - dev_err(&pdev->dev, "failed to alloc spi slave\n"); 393 + dev_err(&pdev->dev, "failed to alloc spi target\n"); 394 394 return -ENOMEM; 395 395 } 396 396
+7 -7
drivers/spi/spi.c
··· 3238 3238 } 3239 3239 3240 3240 /** 3241 - * spi_register_controller - register SPI master or slave controller 3242 - * @ctlr: initialized master, originally from spi_alloc_master() or 3243 - * spi_alloc_slave() 3241 + * spi_register_controller - register SPI host or target controller 3242 + * @ctlr: initialized controller, originally from spi_alloc_host() or 3243 + * spi_alloc_target() 3244 3244 * Context: can sleep 3245 3245 * 3246 3246 * SPI controllers connect to their drivers using some non-SPI bus, ··· 3390 3390 } 3391 3391 3392 3392 /** 3393 - * devm_spi_register_controller - register managed SPI master or slave 3393 + * devm_spi_register_controller - register managed SPI host or target 3394 3394 * controller 3395 3395 * @dev: device managing SPI controller 3396 - * @ctlr: initialized controller, originally from spi_alloc_master() or 3397 - * spi_alloc_slave() 3396 + * @ctlr: initialized controller, originally from spi_alloc_host() or 3397 + * spi_alloc_target() 3398 3398 * Context: can sleep 3399 3399 * 3400 3400 * Register a SPI device as with spi_register_controller() which will ··· 3478 3478 3479 3479 /* 3480 3480 * Release the last reference on the controller if its driver 3481 - * has not yet been converted to devm_spi_alloc_master/slave(). 3481 + * has not yet been converted to devm_spi_alloc_host/target(). 3482 3482 */ 3483 3483 if (!ctlr->devm_allocated) 3484 3484 put_device(&ctlr->dev);
+3 -3
drivers/video/fbdev/mmp/hw/mmp_spi.c
··· 140 140 void **p_regbase; 141 141 int err; 142 142 143 - ctlr = spi_alloc_master(ctrl->dev, sizeof(void *)); 143 + ctlr = spi_alloc_host(ctrl->dev, sizeof(void *)); 144 144 if (!ctlr) { 145 - dev_err(ctrl->dev, "unable to allocate SPI master\n"); 145 + dev_err(ctrl->dev, "unable to allocate SPI host\n"); 146 146 return -ENOMEM; 147 147 } 148 148 p_regbase = spi_controller_get_devdata(ctlr); ··· 156 156 157 157 err = spi_register_controller(ctlr); 158 158 if (err < 0) { 159 - dev_err(ctrl->dev, "unable to register SPI master\n"); 159 + dev_err(ctrl->dev, "unable to register SPI host\n"); 160 160 spi_controller_put(ctlr); 161 161 return err; 162 162 }
-30
include/linux/spi/spi.h
··· 824 824 extern struct spi_controller *__spi_alloc_controller(struct device *host, 825 825 unsigned int size, bool slave); 826 826 827 - static inline struct spi_controller *spi_alloc_master(struct device *host, 828 - unsigned int size) 829 - { 830 - return __spi_alloc_controller(host, size, false); 831 - } 832 - 833 - static inline struct spi_controller *spi_alloc_slave(struct device *host, 834 - unsigned int size) 835 - { 836 - if (!IS_ENABLED(CONFIG_SPI_SLAVE)) 837 - return NULL; 838 - 839 - return __spi_alloc_controller(host, size, true); 840 - } 841 - 842 827 static inline struct spi_controller *spi_alloc_host(struct device *dev, 843 828 unsigned int size) 844 829 { ··· 842 857 struct spi_controller *__devm_spi_alloc_controller(struct device *dev, 843 858 unsigned int size, 844 859 bool slave); 845 - 846 - static inline struct spi_controller *devm_spi_alloc_master(struct device *dev, 847 - unsigned int size) 848 - { 849 - return __devm_spi_alloc_controller(dev, size, false); 850 - } 851 - 852 - static inline struct spi_controller *devm_spi_alloc_slave(struct device *dev, 853 - unsigned int size) 854 - { 855 - if (!IS_ENABLED(CONFIG_SPI_SLAVE)) 856 - return NULL; 857 - 858 - return __devm_spi_alloc_controller(dev, size, true); 859 - } 860 860 861 861 static inline struct spi_controller *devm_spi_alloc_host(struct device *dev, 862 862 unsigned int size)