Commit d05e6266 authored Jan 11, 2024 by Linus Torvalds

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()

parents 893e2f9e fa7280e5

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -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/

drivers/ata/pata_pxa.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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);