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.

Merge tag 'ata-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

Pull ata updates from Damien Le Moal:

- Cleanup the pxa PATA driver to use dma_request_chan() instead of the
deprecated dma_request_slave_channel().

- Add Niklas as co-maintainer of the ata subsystem.

* tag 'ata-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
MAINTAINERS: Add Niklas Cassel as libata maintainer
ata: pata_pxa: convert not to use dma_request_slave_channel()

+5 -5
+2 -1
MAINTAINERS
··· 12145 12145 12146 12146 LIBATA SUBSYSTEM (Serial and Parallel ATA drivers) 12147 12147 M: Damien Le Moal <dlemoal@kernel.org> 12148 + M: Niklas Cassel <cassel@kernel.org> 12148 12149 L: linux-ide@vger.kernel.org 12149 12150 S: Maintained 12150 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git 12151 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux.git 12151 12152 F: Documentation/ABI/testing/sysfs-ata 12152 12153 F: Documentation/devicetree/bindings/ata/ 12153 12154 F: drivers/ata/
+3 -4
drivers/ata/pata_pxa.c
··· 274 274 /* 275 275 * Request the DMA channel 276 276 */ 277 - data->dma_chan = 278 - dma_request_slave_channel(&pdev->dev, "data"); 279 - if (!data->dma_chan) 280 - return -EBUSY; 277 + data->dma_chan = dma_request_chan(&pdev->dev, "data"); 278 + if (IS_ERR(data->dma_chan)) 279 + return PTR_ERR(data->dma_chan); 281 280 ret = dmaengine_slave_config(data->dma_chan, &config); 282 281 if (ret < 0) { 283 282 dev_err(&pdev->dev, "dma configuration failed: %d\n", ret);