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

Commit f272525e authored by Karthikeyan Mani's avatar Karthikeyan Mani
Browse files

drivers: mfd: Support for rmmod of wcd9xxx-core 



Remove child devices of wcd9xxx-core at device
exit. Add removal of irq handles and data on
irq exit.

CRs-fixed: 2092930
Change-Id: Ifbc685f2613fabc9a85ff81bea4707263e3cfe94
Signed-off-by: default avatarKarthikeyan Mani <kmani@codeaurora.org>
parent c8da5ca0

drivers/mfd/wcd9xxx-core.c

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ static void wcd9xxx_device_exit(struct wcd9xxx *wcd9xxx) 
{

	device_init_wakeup(wcd9xxx->dev, false);

	wcd9xxx_irq_exit(&wcd9xxx->core_res);

	mfd_remove_devices(wcd9xxx->dev);

	wcd9xxx_bringdown(wcd9xxx->dev);

	wcd9xxx_reset_low(wcd9xxx->dev);

	wcd9xxx_core_res_deinit(&wcd9xxx->core_res);

drivers/mfd/wcd9xxx-irq.c

+26 −1
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ static int phyirq_to_virq( 
	struct wcd9xxx_core_resource *wcd9xxx_res, int irq);

static unsigned int wcd9xxx_irq_get_upstream_irq(

	struct wcd9xxx_core_resource *wcd9xxx_res);

static void wcd9xxx_irq_put_downstream_irq(

	struct wcd9xxx_core_resource *wcd9xxx_res);

static void wcd9xxx_irq_put_upstream_irq(

	struct wcd9xxx_core_resource *wcd9xxx_res);

static int wcd9xxx_map_irq(
@@ -590,6 +592,7 @@ void wcd9xxx_irq_exit(struct wcd9xxx_core_resource *wcd9xxx_res) 
		disable_irq_wake(wcd9xxx_res->irq);

		free_irq(wcd9xxx_res->irq, wcd9xxx_res);

		wcd9xxx_res->irq = 0;

		wcd9xxx_irq_put_downstream_irq(wcd9xxx_res);

		wcd9xxx_irq_put_upstream_irq(wcd9xxx_res);

	}

	mutex_destroy(&wcd9xxx_res->irq_lock);
@@ -712,6 +715,29 @@ static unsigned int wcd9xxx_irq_get_upstream_irq( 
	return data->irq;

}



static void wcd9xxx_irq_put_downstream_irq(

			struct wcd9xxx_core_resource *wcd9xxx_res)

{

	int irq, virq, ret;



	/*

	 * IRQ migration hits error if the chip data and handles

	 * are not made NULL. make associated data and handles

	 * to NULL at irq_exit

	 */

	for (irq = 0; irq < wcd9xxx_res->num_irqs; irq++) {

		virq = wcd9xxx_map_irq(wcd9xxx_res, irq);

		pr_debug("%s: irq %d -> %d\n", __func__, irq, virq);

		ret = irq_set_chip_data(virq, NULL);

		if (ret) {

			pr_err("%s: Failed to configure irq %d (%d)\n",

				__func__, irq, ret);

			return;

		}

		irq_set_chip_and_handler(virq, NULL, NULL);

	}

}



static void wcd9xxx_irq_put_upstream_irq(

			struct wcd9xxx_core_resource *wcd9xxx_res)

{
@@ -779,7 +805,6 @@ static int wcd9xxx_irq_remove(struct platform_device *pdev) 
	wmb();

	irq_domain_remove(data->domain);

	kfree(data);

	domain->host_data = NULL;



	return 0;

}