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

Commit f8a09605 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: simplify error handling via devres function. 

Use devm_ and pcim_ functions to make error handling
simpler and code smaller and tidier.

Based on original patch by
mei: me: use managed functions pcim_* and devm_*
https://lkml.org/lkml/2016/2/1/339



Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f046192d

drivers/misc/mei/hw-me.c

+3 −3
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ const struct mei_cfg mei_me_pch8_sps_cfg = { 
 * @pdev: The pci device structure

 * @cfg: per device generation config

 *

 * Return: The mei_device_device pointer on success, NULL on failure.

 * Return: The mei_device pointer on success, NULL on failure.

 */

struct mei_device *mei_me_dev_init(struct pci_dev *pdev,

				   const struct mei_cfg *cfg)
@@ -1397,7 +1397,7 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev, 
	struct mei_device *dev;

	struct mei_me_hw *hw;



	dev = kzalloc(sizeof(struct mei_device) +

	dev = devm_kzalloc(&pdev->dev, sizeof(struct mei_device) +

			   sizeof(struct mei_me_hw), GFP_KERNEL);

	if (!dev)

		return NULL;

drivers/misc/mei/hw-txe.c

+2 −2
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev) 
	struct mei_device *dev;

	struct mei_txe_hw *hw;



	dev = kzalloc(sizeof(struct mei_device) +

	dev = devm_kzalloc(&pdev->dev, sizeof(struct mei_device) +

			   sizeof(struct mei_txe_hw), GFP_KERNEL);

	if (!dev)

		return NULL;

drivers/misc/mei/hw-txe.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
 * @intr_cause:          translated interrupt cause

 */

struct mei_txe_hw {

	void __iomem *mem_addr[NUM_OF_MEM_BARS];

	void __iomem * const *mem_addr;

	u32 aliveness;

	u32 readiness;

	u32 slots;

drivers/misc/mei/pci-me.c

+10 −40
Original line number Diff line number Diff line
@@ -149,18 +149,18 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return -ENODEV;



	/* enable pci dev */

	err = pci_enable_device(pdev);

	err = pcim_enable_device(pdev);

	if (err) {

		dev_err(&pdev->dev, "failed to enable pci device.\n");

		goto end;

	}

	/* set PCI host mastering  */

	pci_set_master(pdev);

	/* pci request regions for mei driver */

	err = pci_request_regions(pdev, KBUILD_MODNAME);

	/* pci request regions and mapping IO device memory for mei driver */

	err = pcim_iomap_regions(pdev, BIT(0), KBUILD_MODNAME);

	if (err) {

		dev_err(&pdev->dev, "failed to get pci regions.\n");

		goto disable_device;

		goto end;

	}



	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) ||
@@ -173,24 +173,18 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	if (err) {

		dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");

		goto release_regions;

		goto end;

	}





	/* allocates and initializes the mei dev structure */

	dev = mei_me_dev_init(pdev, cfg);

	if (!dev) {

		err = -ENOMEM;

		goto release_regions;

		goto end;

	}

	hw = to_me_hw(dev);

	/* mapping  IO device memory */

	hw->mem_addr = pci_iomap(pdev, 0, 0);

	if (!hw->mem_addr) {

		dev_err(&pdev->dev, "mapping I/O device memory failure.\n");

		err = -ENOMEM;

		goto free_device;

	}

	hw->mem_addr = pcim_iomap_table(pdev)[0];



	pci_enable_msi(pdev);



	 /* request and enable interrupt */
@@ -203,7 +197,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err) {

		dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n",

		       pdev->irq);

		goto disable_msi;

		goto end;

	}



	if (mei_start(dev)) {
@@ -242,15 +236,6 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	mei_cancel_work(dev);

	mei_disable_interrupts(dev);

	free_irq(pdev->irq, dev);

disable_msi:

	pci_disable_msi(pdev);

	pci_iounmap(pdev, hw->mem_addr);

free_device:

	kfree(dev);

release_regions:

	pci_release_regions(pdev);

disable_device:

	pci_disable_device(pdev);

end:

	dev_err(&pdev->dev, "initialization failed.\n");

	return err;
@@ -267,7 +252,6 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
static void mei_me_remove(struct pci_dev *pdev)

{

	struct mei_device *dev;

	struct mei_me_hw *hw;



	dev = pci_get_drvdata(pdev);

	if (!dev)
@@ -276,33 +260,19 @@ static void mei_me_remove(struct pci_dev *pdev) 
	if (mei_pg_is_enabled(dev))

		pm_runtime_get_noresume(&pdev->dev);



	hw = to_me_hw(dev);





	dev_dbg(&pdev->dev, "stop\n");

	mei_stop(dev);



	if (!pci_dev_run_wake(pdev))

		mei_me_unset_pm_domain(dev);



	/* disable interrupts */

	mei_disable_interrupts(dev);



	free_irq(pdev->irq, dev);

	pci_disable_msi(pdev);



	if (hw->mem_addr)

		pci_iounmap(pdev, hw->mem_addr);



	mei_deregister(dev);



	kfree(dev);



	pci_release_regions(pdev);

	pci_disable_device(pdev);





}



#ifdef CONFIG_PM_SLEEP

static int mei_me_pci_suspend(struct device *device)

{

drivers/misc/mei/pci-txe.c

+10 −59
Original line number Diff line number Diff line
@@ -52,17 +52,6 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev) {} 
static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {}

#endif /* CONFIG_PM */



static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw)

{

	int i;



	for (i = SEC_BAR; i < NUM_OF_MEM_BARS; i++) {

		if (hw->mem_addr[i]) {

			pci_iounmap(pdev, hw->mem_addr[i]);

			hw->mem_addr[i] = NULL;

		}

	}

}

/**

 * mei_txe_probe - Device Initialization Routine

 *
@@ -75,22 +64,22 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
{

	struct mei_device *dev;

	struct mei_txe_hw *hw;

	const int mask = BIT(SEC_BAR) | BIT(BRIDGE_BAR);

	int err;

	int i;



	/* enable pci dev */

	err = pci_enable_device(pdev);

	err = pcim_enable_device(pdev);

	if (err) {

		dev_err(&pdev->dev, "failed to enable pci device.\n");

		goto end;

	}

	/* set PCI host mastering  */

	pci_set_master(pdev);

	/* pci request regions for mei driver */

	err = pci_request_regions(pdev, KBUILD_MODNAME);

	/* pci request regions and mapping IO device memory for mei driver */

	err = pcim_iomap_regions(pdev, mask, KBUILD_MODNAME);

	if (err) {

		dev_err(&pdev->dev, "failed to get pci regions.\n");

		goto disable_device;

		goto end;

	}



	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
@@ -98,7 +87,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		if (err) {

			dev_err(&pdev->dev, "No suitable DMA available.\n");

			goto release_regions;

			goto end;

		}

	}
@@ -106,20 +95,10 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev = mei_txe_dev_init(pdev);

	if (!dev) {

		err = -ENOMEM;

		goto release_regions;

		goto end;

	}

	hw = to_txe_hw(dev);



	/* mapping  IO device memory */

	for (i = SEC_BAR; i < NUM_OF_MEM_BARS; i++) {

		hw->mem_addr[i] = pci_iomap(pdev, i, 0);

		if (!hw->mem_addr[i]) {

			dev_err(&pdev->dev, "mapping I/O device memory failure.\n");

			err = -ENOMEM;

			goto free_device;

		}

	}



	hw->mem_addr = pcim_iomap_table(pdev);



	pci_enable_msi(pdev);
@@ -140,7 +119,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err) {

		dev_err(&pdev->dev, "mei: request_threaded_irq failure. irq = %d\n",

			pdev->irq);

		goto free_device;

		goto end;

	}



	if (mei_start(dev)) {
@@ -173,23 +152,9 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
stop:

	mei_stop(dev);

release_irq:



	mei_cancel_work(dev);



	/* disable interrupts */

	mei_disable_interrupts(dev);



	free_irq(pdev->irq, dev);

	pci_disable_msi(pdev);



free_device:

	mei_txe_pci_iounmap(pdev, hw);



	kfree(dev);

release_regions:

	pci_release_regions(pdev);

disable_device:

	pci_disable_device(pdev);

end:

	dev_err(&pdev->dev, "initialization failed.\n");

	return err;
@@ -206,38 +171,24 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
static void mei_txe_remove(struct pci_dev *pdev)

{

	struct mei_device *dev;

	struct mei_txe_hw *hw;



	dev = pci_get_drvdata(pdev);

	if (!dev) {

		dev_err(&pdev->dev, "mei: dev =NULL\n");

		dev_err(&pdev->dev, "mei: dev == NULL\n");

		return;

	}



	pm_runtime_get_noresume(&pdev->dev);



	hw = to_txe_hw(dev);



	mei_stop(dev);



	if (!pci_dev_run_wake(pdev))

		mei_txe_unset_pm_domain(dev);



	/* disable interrupts */

	mei_disable_interrupts(dev);

	free_irq(pdev->irq, dev);

	pci_disable_msi(pdev);



	pci_set_drvdata(pdev, NULL);



	mei_txe_pci_iounmap(pdev, hw);



	mei_deregister(dev);



	kfree(dev);



	pci_release_regions(pdev);

	pci_disable_device(pdev);

}