diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-11 13:49:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-11 13:49:00 -0800 |
| commit | d05e626603d57936314816433db8bf1d34b5a504 (patch) | |
| tree | 3301c35fd7ec1e71efc9c33ebca2e96ffe9131df | |
| parent | 893e2f9eac9ec8d65a5ae2d99656d5e9f7bd76e2 (diff) | |
| parent | fa7280e5dd815363af147dc5358b25f5a06c9c68 (diff) | |
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()
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | drivers/ata/pata_pxa.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9661dea81c2..3a3db42fff2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12145,9 +12145,10 @@ F: drivers/ata/sata_promise.* LIBATA SUBSYSTEM (Serial and Parallel ATA drivers) M: Damien Le Moal <dlemoal@kernel.org> +M: Niklas Cassel <cassel@kernel.org> L: linux-ide@vger.kernel.org S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux.git F: Documentation/ABI/testing/sysfs-ata F: Documentation/devicetree/bindings/ata/ F: drivers/ata/ diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c index 5275c6464f57..538bd3423d85 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c @@ -274,10 +274,9 @@ static int pxa_ata_probe(struct platform_device *pdev) /* * Request the DMA channel */ - data->dma_chan = - dma_request_slave_channel(&pdev->dev, "data"); - if (!data->dma_chan) - return -EBUSY; + data->dma_chan = dma_request_chan(&pdev->dev, "data"); + if (IS_ERR(data->dma_chan)) + return PTR_ERR(data->dma_chan); ret = dmaengine_slave_config(data->dma_chan, &config); if (ret < 0) { dev_err(&pdev->dev, "dma configuration failed: %d\n", ret); |