Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b75415 authored by Romain Perier's avatar Romain Perier Committed by Kalle Valo
Browse files

wireless: ipw2200: Replace PCI pool old API 



The PCI pool API is deprecated. This commit replaces the PCI pool old
API by the appropriate function with the DMA pool API.

Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Reviewed-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Acked-by: default avatarStanislav Yakovlev <stas.yakovlev@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2cc8918e

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+7 −6
Original line number Diff line number Diff line
@@ -3209,7 +3209,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) 
	struct fw_chunk *chunk;

	int total_nr = 0;

	int i;

	struct pci_pool *pool;

	struct dma_pool *pool;

	void **virts;

	dma_addr_t *phys;
@@ -3226,9 +3226,10 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) 
		kfree(virts);

		return -ENOMEM;

	}

	pool = pci_pool_create("ipw2200", priv->pci_dev, CB_MAX_LENGTH, 0, 0);

	pool = dma_pool_create("ipw2200", &priv->pci_dev->dev, CB_MAX_LENGTH, 0,

			       0);

	if (!pool) {

		IPW_ERROR("pci_pool_create failed\n");

		IPW_ERROR("dma_pool_create failed\n");

		kfree(phys);

		kfree(virts);

		return -ENOMEM;
@@ -3253,7 +3254,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) 


		nr = (chunk_len + CB_MAX_LENGTH - 1) / CB_MAX_LENGTH;

		for (i = 0; i < nr; i++) {

			virts[total_nr] = pci_pool_alloc(pool, GFP_KERNEL,

			virts[total_nr] = dma_pool_alloc(pool, GFP_KERNEL,

							 &phys[total_nr]);

			if (!virts[total_nr]) {

				ret = -ENOMEM;
@@ -3297,9 +3298,9 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) 
	}

 out:

	for (i = 0; i < total_nr; i++)

		pci_pool_free(pool, virts[i], phys[i]);

		dma_pool_free(pool, virts[i], phys[i]);



	pci_pool_destroy(pool);

	dma_pool_destroy(pool);

	kfree(phys);

	kfree(virts);