Commit 98ff4490 authored by George Cherian's avatar George Cherian Committed by Linus Walleij
Browse files

gpio: pcf857x: remove the irq_demux_work and gpio->irq 



Now that we are using devm_request_threaded_irq no need for
irq_demux_work and gpio->irq. Remove all its references.

Signed-off-by: default avatarGeorge Cherian <george.cherian@ti.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5c21d008

drivers/gpio/gpio-pcf857x.c

+0 −37
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/workqueue.h>





static const struct i2c_device_id pcf857x_id[] = {
@@ -66,12 +65,10 @@ struct pcf857x { 
	struct gpio_chip	chip;

	struct i2c_client	*client;

	struct mutex		lock;		/* protect 'out' */

	struct work_struct	work;		/* irq demux work */

	struct irq_domain	*irq_domain;	/* for irq demux  */

	spinlock_t		slock;		/* protect irq demux */

	unsigned		out;		/* software latch */

	unsigned		status;		/* current status */

	int			irq;		/* real irq number */



	int (*write)(struct i2c_client *client, unsigned data);

	int (*read)(struct i2c_client *client);
@@ -187,38 +184,6 @@ static irqreturn_t pcf857x_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static void pcf857x_irq_demux_work(struct work_struct *work)

{

	struct pcf857x *gpio = container_of(work,

					       struct pcf857x,

					       work);

	unsigned long change, i, status, flags;



	status = gpio->read(gpio->client);



	spin_lock_irqsave(&gpio->slock, flags);



	change = gpio->status ^ status;

	for_each_set_bit(i, &change, gpio->chip.ngpio)

		generic_handle_irq(irq_find_mapping(gpio->irq_domain, i));

	gpio->status = status;



	spin_unlock_irqrestore(&gpio->slock, flags);

}



static irqreturn_t pcf857x_irq_demux(int irq, void *data)

{

	struct pcf857x	*gpio = data;



	/*

	 * pcf857x can't read/write data here,

	 * since i2c data access might go to sleep.

	 */

	schedule_work(&gpio->work);



	return IRQ_HANDLED;

}



static int pcf857x_irq_domain_map(struct irq_domain *domain, unsigned int virq,

				 irq_hw_number_t hw)

{
@@ -261,9 +226,7 @@ static int pcf857x_irq_domain_init(struct pcf857x *gpio, 
		goto fail;



	/* enable gpio_to_irq() */

	INIT_WORK(&gpio->work, pcf857x_irq_demux_work);

	gpio->chip.to_irq	= pcf857x_to_irq;

	gpio->irq		= client->irq;



	return 0;