Commit 8320442b authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

firewire: ohci: use devres for misc DMA buffer 

The 1394 OHCI driver allocates a DMA coherent buffer for multi-purposes.
The buffer is split into three region for specific purposes; i.e. 1/4 for
context descriptors of AR request and response as well as 1/2 for self
ID handling.

This commit uses managed device resource to maintain the lifetime of
buffer.

Link: https://lore.kernel.org/r/20230604054451.161076-5-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent 086a0afb

drivers/firewire/ohci.c

+3 −10
Original line number Diff line number Diff line
@@ -3634,9 +3634,7 @@ static int pci_probe(struct pci_dev *dev, 
	 */

	BUILD_BUG_ON(AR_BUFFERS * sizeof(struct descriptor) > PAGE_SIZE/4);

	BUILD_BUG_ON(SELF_ID_BUF_SIZE > PAGE_SIZE/2);

	ohci->misc_buffer = dma_alloc_coherent(ohci->card.device,

					       PAGE_SIZE,

					       &ohci->misc_buffer_bus,

	ohci->misc_buffer = dmam_alloc_coherent(&dev->dev, PAGE_SIZE, &ohci->misc_buffer_bus,

						GFP_KERNEL);

	if (!ohci->misc_buffer)

		return -ENOMEM;
@@ -3644,7 +3642,7 @@ static int pci_probe(struct pci_dev *dev, 
	err = ar_context_init(&ohci->ar_request_ctx, ohci, 0,

			      OHCI1394_AsReqRcvContextControlSet);

	if (err < 0)

		goto fail_misc_buf;

		return err;



	err = ar_context_init(&ohci->ar_response_ctx, ohci, PAGE_SIZE/4,

			      OHCI1394_AsRspRcvContextControlSet);
@@ -3736,9 +3734,6 @@ static int pci_probe(struct pci_dev *dev, 
	ar_context_release(&ohci->ar_response_ctx);

 fail_arreq_ctx:

	ar_context_release(&ohci->ar_request_ctx);

 fail_misc_buf:

	dma_free_coherent(ohci->card.device, PAGE_SIZE,

			  ohci->misc_buffer, ohci->misc_buffer_bus);



	return err;

}
@@ -3774,8 +3769,6 @@ static void pci_remove(struct pci_dev *dev) 
				  ohci->config_rom, ohci->config_rom_bus);

	ar_context_release(&ohci->ar_request_ctx);

	ar_context_release(&ohci->ar_response_ctx);

	dma_free_coherent(ohci->card.device, PAGE_SIZE,

			  ohci->misc_buffer, ohci->misc_buffer_bus);

	context_release(&ohci->at_request_ctx);

	context_release(&ohci->at_response_ctx);

	kfree(ohci->it_context_list);