linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] Input: tps6507x-ts - use bool for booleans
@ 2013-06-10  5:53 Dmitry Torokhov
  2013-06-10  5:53 ` [PATCH 2/3] Input: tps6507x-ts - remove vref from platform data Dmitry Torokhov
  2013-06-10  5:53 ` [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure Dmitry Torokhov
  0 siblings, 2 replies; 7+ messages in thread
From: Dmitry Torokhov @ 2013-06-10  5:53 UTC (permalink / raw)
  To: linux-input; +Cc: manishv.b, davinci-linux-open-source

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

Note that neither of these 3 patches has been tested on the real hardware as
I don't have it so if someone could give them a spin that would be great.

 drivers/input/touchscreen/tps6507x-ts.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index 1fb397c..c981ccf 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -45,12 +45,12 @@ struct tps6507x_ts {
 	struct ts_event		tc;
 	struct tps6507x_dev	*mfd;
 	u16			model;
-	unsigned		pendown;
+	u16			min_pressure;
 	int			irq;
 	void			(*clear_penirq)(void);
 	unsigned long		poll_period;	/* ms */
-	u16			min_pressure;
 	int			vref;		/* non-zero to leave vref on */
+	bool			pendown;
 };
 
 static int tps6507x_read_u8(struct tps6507x_ts *tsc, u8 reg, u8 *data)
@@ -165,12 +165,12 @@ static void tps6507x_ts_handler(struct work_struct *work)
 	struct tps6507x_ts *tsc =  container_of(work,
 				struct tps6507x_ts, work.work);
 	struct input_dev *input_dev = tsc->input_dev;
-	int pendown;
+	bool pendown;
 	int schd;
 	s32 ret;
 
-	ret =  tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
-				       &tsc->tc.pressure);
+	ret = tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
+				      &tsc->tc.pressure);
 	if (ret)
 		goto done;
 
@@ -181,7 +181,7 @@ static void tps6507x_ts_handler(struct work_struct *work)
 		input_report_key(input_dev, BTN_TOUCH, 0);
 		input_report_abs(input_dev, ABS_PRESSURE, 0);
 		input_sync(input_dev);
-		tsc->pendown = 0;
+		tsc->pendown = false;
 	}
 
 	if (pendown) {
@@ -206,7 +206,7 @@ static void tps6507x_ts_handler(struct work_struct *work)
 		input_report_abs(input_dev, ABS_Y, tsc->tc.y);
 		input_report_abs(input_dev, ABS_PRESSURE, tsc->tc.pressure);
 		input_sync(input_dev);
-		tsc->pendown = 1;
+		tsc->pendown = true;
 	}
 
 done:
-- 
1.8.1.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/3] Input: tps6507x-ts - remove vref from platform data
  2013-06-10  5:53 [PATCH 1/3] Input: tps6507x-ts - use bool for booleans Dmitry Torokhov
@ 2013-06-10  5:53 ` Dmitry Torokhov
  2013-07-02 15:49   ` Kevin Hilman
  2013-06-10  5:53 ` [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure Dmitry Torokhov
  1 sibling, 1 reply; 7+ messages in thread
From: Dmitry Torokhov @ 2013-06-10  5:53 UTC (permalink / raw)
  To: linux-input; +Cc: manishv.b, davinci-linux-open-source

Although defined in platform data, vref is not used anywhere.

Also remove model, irq, and clear_penirq as they are not used either.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/touchscreen/tps6507x-ts.c | 5 -----
 include/linux/input/tps6507x-ts.h       | 1 -
 2 files changed, 6 deletions(-)

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index c981ccf..d3c2967 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -44,12 +44,8 @@ struct tps6507x_ts {
 	struct delayed_work	work;
 	struct ts_event		tc;
 	struct tps6507x_dev	*mfd;
-	u16			model;
 	u16			min_pressure;
-	int			irq;
-	void			(*clear_penirq)(void);
 	unsigned long		poll_period;	/* ms */
-	int			vref;		/* non-zero to leave vref on */
 	bool			pendown;
 };
 
@@ -291,7 +287,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 
 	if (init_data) {
 		tsc->poll_period = init_data->poll_period;
-		tsc->vref = init_data->vref;
 		tsc->min_pressure = init_data->min_pressure;
 		input_dev->id.vendor = init_data->vendor;
 		input_dev->id.product = init_data->product;
diff --git a/include/linux/input/tps6507x-ts.h b/include/linux/input/tps6507x-ts.h
index ab14403..b433df8 100644
--- a/include/linux/input/tps6507x-ts.h
+++ b/include/linux/input/tps6507x-ts.h
@@ -14,7 +14,6 @@
 /* Board specific touch screen initial values */
 struct touchscreen_init_data {
 	int	poll_period;	/* ms */
-	int	vref;		/* non-zero to leave vref on */
 	__u16	min_pressure;	/* min reading to be treated as a touch */
 	__u16	vendor;
 	__u16	product;
-- 
1.8.1.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure
  2013-06-10  5:53 [PATCH 1/3] Input: tps6507x-ts - use bool for booleans Dmitry Torokhov
  2013-06-10  5:53 ` [PATCH 2/3] Input: tps6507x-ts - remove vref from platform data Dmitry Torokhov
@ 2013-06-10  5:53 ` Dmitry Torokhov
  2013-06-12  7:12   ` Vishwanathrao Badarkhe, Manish
  1 sibling, 1 reply; 7+ messages in thread
From: Dmitry Torokhov @ 2013-06-10  5:53 UTC (permalink / raw)
  To: linux-input; +Cc: manishv.b, davinci-linux-open-source

There is no need to roll our own polling scheme when we already have
one implemented by the core.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/touchscreen/tps6507x-ts.c | 126 ++++++++++++--------------------
 include/linux/mfd/tps6507x.h            |   1 -
 2 files changed, 48 insertions(+), 79 deletions(-)

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index d3c2967..94cde2c 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -17,6 +17,7 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 #include <linux/input.h>
+#include <linux/input-polldev.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/input/tps6507x-ts.h>
@@ -38,14 +39,12 @@ struct ts_event {
 };
 
 struct tps6507x_ts {
-	struct input_dev	*input_dev;
 	struct device		*dev;
+	struct input_polled_dev	*poll_dev;
+	struct tps6507x_dev	*mfd;
 	char			phys[32];
-	struct delayed_work	work;
 	struct ts_event		tc;
-	struct tps6507x_dev	*mfd;
 	u16			min_pressure;
-	unsigned long		poll_period;	/* ms */
 	bool			pendown;
 };
 
@@ -156,13 +155,11 @@ static s32 tps6507x_adc_standby(struct tps6507x_ts *tsc)
 	return ret;
 }
 
-static void tps6507x_ts_handler(struct work_struct *work)
+static void tps6507x_ts_poll(struct input_polled_dev *poll_dev)
 {
-	struct tps6507x_ts *tsc =  container_of(work,
-				struct tps6507x_ts, work.work);
-	struct input_dev *input_dev = tsc->input_dev;
+	struct tps6507x_ts *tsc = poll_dev->private;
+	struct input_dev *input_dev = poll_dev->input;
 	bool pendown;
-	int schd;
 	s32 ret;
 
 	ret = tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
@@ -206,62 +203,65 @@ static void tps6507x_ts_handler(struct work_struct *work)
 	}
 
 done:
-	/* always poll if not using interrupts */
-	schd = schedule_delayed_work(&tsc->work,
-				msecs_to_jiffies(tsc->poll_period));
-	if (!schd)
-		dev_err(tsc->dev, "re-schedule failed");
-
-	ret = tps6507x_adc_standby(tsc);
+	tps6507x_adc_standby(tsc);
 }
 
 static int tps6507x_ts_probe(struct platform_device *pdev)
 {
-	int error;
-	struct tps6507x_ts *tsc;
 	struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent);
-	struct touchscreen_init_data *init_data;
+	const struct tps6507x_board *tps_board;
+	const struct touchscreen_init_data *init_data;
+	struct tps6507x_ts *tsc;
+	struct input_polled_dev *poll_dev;
 	struct input_dev *input_dev;
-	struct tps6507x_board *tps_board;
-	int schd;
+	int error;
 
-	/**
+	/*
 	 * tps_board points to pmic related constants
 	 * coming from the board-evm file.
 	 */
-
-	tps_board = (struct tps6507x_board *)tps6507x_dev->dev->platform_data;
-
+	tps_board = dev_get_platdata(tps6507x_dev->dev);
 	if (!tps_board) {
 		dev_err(tps6507x_dev->dev,
 			"Could not find tps6507x platform data\n");
-		return -EIO;
+		return -ENODEV;
 	}
 
-	/**
+	/*
 	 * init_data points to array of regulator_init structures
 	 * coming from the board-evm file.
 	 */
-
 	init_data = tps_board->tps6507x_ts_init_data;
 
 	tsc = kzalloc(sizeof(struct tps6507x_ts), GFP_KERNEL);
 	if (!tsc) {
 		dev_err(tps6507x_dev->dev, "failed to allocate driver data\n");
-		error = -ENOMEM;
-		goto err0;
+		return -ENOMEM;
 	}
 
-	tps6507x_dev->ts = tsc;
 	tsc->mfd = tps6507x_dev;
 	tsc->dev = tps6507x_dev->dev;
-	input_dev = input_allocate_device();
-	if (!input_dev) {
-		dev_err(tsc->dev, "Failed to allocate input device.\n");
+	tsc->min_pressure = init_data ?
+			init_data->min_pressure : TPS_DEFAULT_MIN_PRESSURE;
+
+	snprintf(tsc->phys, sizeof(tsc->phys),
+		 "%s/input0", dev_name(tsc->dev));
+
+	poll_dev = input_allocate_polled_device();
+	if (!poll_dev) {
+		dev_err(tsc->dev, "Failed to allocate polled input device.\n");
 		error = -ENOMEM;
-		goto err1;
+		goto err_free_mem;
 	}
 
+	tsc->poll_dev = poll_dev;
+
+	poll_dev->private = tsc;
+	poll_dev->poll = tps6507x_ts_poll;
+	poll_dev->poll_interval = init_data ?
+			init_data->poll_period : TSC_DEFAULT_POLL_PERIOD;
+
+	input_dev = poll_dev->input;
 	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 	input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
@@ -270,72 +270,42 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 	input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_10BIT, 0, 0);
 
 	input_dev->name = "TPS6507x Touchscreen";
-	input_dev->id.bustype = BUS_I2C;
-	input_dev->dev.parent = tsc->dev;
-
-	snprintf(tsc->phys, sizeof(tsc->phys),
-		 "%s/input0", dev_name(tsc->dev));
 	input_dev->phys = tsc->phys;
-
-	dev_dbg(tsc->dev, "device: %s\n", input_dev->phys);
-
-	input_set_drvdata(input_dev, tsc);
-
-	tsc->input_dev = input_dev;
-
-	INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);
-
+	input_dev->dev.parent = tsc->dev;
+	input_dev->id.bustype = BUS_I2C;
 	if (init_data) {
-		tsc->poll_period = init_data->poll_period;
-		tsc->min_pressure = init_data->min_pressure;
 		input_dev->id.vendor = init_data->vendor;
 		input_dev->id.product = init_data->product;
 		input_dev->id.version = init_data->version;
-	} else {
-		tsc->poll_period = TSC_DEFAULT_POLL_PERIOD;
-		tsc->min_pressure = TPS_DEFAULT_MIN_PRESSURE;
 	}
 
 	error = tps6507x_adc_standby(tsc);
 	if (error)
-		goto err2;
+		goto err_free_polled_dev;
 
-	error = input_register_device(input_dev);
+	error = input_register_polled_device(poll_dev);
 	if (error)
-		goto err2;
-
-	schd = schedule_delayed_work(&tsc->work,
-				     msecs_to_jiffies(tsc->poll_period));
+		goto err_free_polled_dev;
 
-	if (!schd) {
-		dev_err(tsc->dev, "schedule failed");
-		goto err2;
-	 }
-	platform_set_drvdata(pdev, tps6507x_dev);
+	platform_set_drvdata(pdev, tsc);
 
 	return 0;
 
-err2:
-	cancel_delayed_work_sync(&tsc->work);
-	input_free_device(input_dev);
-err1:
+err_free_polled_dev:
+	input_free_polled_device(poll_dev);
+err_free_mem:
 	kfree(tsc);
-	tps6507x_dev->ts = NULL;
-err0:
 	return error;
 }
 
 static int tps6507x_ts_remove(struct platform_device *pdev)
 {
-	struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
-	struct tps6507x_ts *tsc = tps6507x_dev->ts;
-	struct input_dev *input_dev = tsc->input_dev;
-
-	cancel_delayed_work_sync(&tsc->work);
+	struct tps6507x_ts *tsc = platform_get_drvdata(pdev);
+	struct input_polled_dev *poll_dev = tsc->poll_dev;
 
-	input_unregister_device(input_dev);
+	input_unregister_polled_device(poll_dev);
+	input_free_polled_device(poll_dev);
 
-	tps6507x_dev->ts = NULL;
 	kfree(tsc);
 
 	return 0;
diff --git a/include/linux/mfd/tps6507x.h b/include/linux/mfd/tps6507x.h
index c923e48..c2ae569 100644
--- a/include/linux/mfd/tps6507x.h
+++ b/include/linux/mfd/tps6507x.h
@@ -163,7 +163,6 @@ struct tps6507x_dev {
 
 	/* Client devices */
 	struct tps6507x_pmic *pmic;
-	struct tps6507x_ts *ts;
 };
 
 #endif /*  __LINUX_MFD_TPS6507X_H */
-- 
1.8.1.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* RE: [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure
  2013-06-10  5:53 ` [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure Dmitry Torokhov
@ 2013-06-12  7:12   ` Vishwanathrao Badarkhe, Manish
  2013-06-19  6:17     ` Dmitry Torokhov
  0 siblings, 1 reply; 7+ messages in thread
From: Vishwanathrao Badarkhe, Manish @ 2013-06-12  7:12 UTC (permalink / raw)
  To: Dmitry Torokhov, linux-input@vger.kernel.org
  Cc: davinci-linux-open-source@linux.davincidsp.com

Hi Dmitry,

On Mon, Jun 10, 2013 at 11:23:47, Dmitry Torokhov wrote:
> There is no need to roll our own polling scheme when we already have
> one implemented by the core.

Please let me know, on which branch this patch series is based on? 
I failed to apply these patches on master branch of "linux-next". 

> 
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/input/touchscreen/tps6507x-ts.c | 126 ++++++++++++--------------------
>  include/linux/mfd/tps6507x.h            |   1 -
>  2 files changed, 48 insertions(+), 79 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
> index d3c2967..94cde2c 100644
> --- a/drivers/input/touchscreen/tps6507x-ts.c
> +++ b/drivers/input/touchscreen/tps6507x-ts.c
> @@ -17,6 +17,7 @@
>  #include <linux/workqueue.h>
>  #include <linux/slab.h>
>  #include <linux/input.h>
> +#include <linux/input-polldev.h>
>  #include <linux/platform_device.h>
>  #include <linux/mfd/tps6507x.h>
>  #include <linux/input/tps6507x-ts.h>
> @@ -38,14 +39,12 @@ struct ts_event {
>  };
>  
>  struct tps6507x_ts {
> -	struct input_dev	*input_dev;
>  	struct device		*dev;
> +	struct input_polled_dev	*poll_dev;
> +	struct tps6507x_dev	*mfd;
>  	char			phys[32];
> -	struct delayed_work	work;
>  	struct ts_event		tc;
> -	struct tps6507x_dev	*mfd;
>  	u16			min_pressure;
> -	unsigned long		poll_period;	/* ms */
>  	bool			pendown;
>  };
>  
> @@ -156,13 +155,11 @@ static s32 tps6507x_adc_standby(struct tps6507x_ts *tsc)
>  	return ret;
>  }
>  
> -static void tps6507x_ts_handler(struct work_struct *work)
> +static void tps6507x_ts_poll(struct input_polled_dev *poll_dev)
>  {
> -	struct tps6507x_ts *tsc =  container_of(work,
> -				struct tps6507x_ts, work.work);
> -	struct input_dev *input_dev = tsc->input_dev;
> +	struct tps6507x_ts *tsc = poll_dev->private;
> +	struct input_dev *input_dev = poll_dev->input;
>  	bool pendown;
> -	int schd;
>  	s32 ret;
>  
>  	ret = tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
> @@ -206,62 +203,65 @@ static void tps6507x_ts_handler(struct work_struct *work)
>  	}
>  
>  done:
> -	/* always poll if not using interrupts */
> -	schd = schedule_delayed_work(&tsc->work,
> -				msecs_to_jiffies(tsc->poll_period));
> -	if (!schd)
> -		dev_err(tsc->dev, "re-schedule failed");
> -
> -	ret = tps6507x_adc_standby(tsc);
> +	tps6507x_adc_standby(tsc);
>  }
>  
>  static int tps6507x_ts_probe(struct platform_device *pdev)
>  {
> -	int error;
> -	struct tps6507x_ts *tsc;
>  	struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent);
> -	struct touchscreen_init_data *init_data;
> +	const struct tps6507x_board *tps_board;
> +	const struct touchscreen_init_data *init_data;
> +	struct tps6507x_ts *tsc;
> +	struct input_polled_dev *poll_dev;
>  	struct input_dev *input_dev;
> -	struct tps6507x_board *tps_board;
> -	int schd;
> +	int error;
>  
> -	/**
> +	/*
>  	 * tps_board points to pmic related constants
>  	 * coming from the board-evm file.
>  	 */
> -
> -	tps_board = (struct tps6507x_board *)tps6507x_dev->dev->platform_data;
> -
> +	tps_board = dev_get_platdata(tps6507x_dev->dev);
>  	if (!tps_board) {
>  		dev_err(tps6507x_dev->dev,
>  			"Could not find tps6507x platform data\n");
> -		return -EIO;
> +		return -ENODEV;
>  	}
>  
> -	/**
> +	/*
>  	 * init_data points to array of regulator_init structures
>  	 * coming from the board-evm file.
>  	 */
> -
>  	init_data = tps_board->tps6507x_ts_init_data;
>  
>  	tsc = kzalloc(sizeof(struct tps6507x_ts), GFP_KERNEL);
>  	if (!tsc) {
>  		dev_err(tps6507x_dev->dev, "failed to allocate driver data\n");
> -		error = -ENOMEM;
> -		goto err0;
> +		return -ENOMEM;
>  	}
>  
> -	tps6507x_dev->ts = tsc;
>  	tsc->mfd = tps6507x_dev;
>  	tsc->dev = tps6507x_dev->dev;
> -	input_dev = input_allocate_device();
> -	if (!input_dev) {
> -		dev_err(tsc->dev, "Failed to allocate input device.\n");
> +	tsc->min_pressure = init_data ?
> +			init_data->min_pressure : TPS_DEFAULT_MIN_PRESSURE;
> +
> +	snprintf(tsc->phys, sizeof(tsc->phys),
> +		 "%s/input0", dev_name(tsc->dev));
> +
> +	poll_dev = input_allocate_polled_device();
> +	if (!poll_dev) {
> +		dev_err(tsc->dev, "Failed to allocate polled input device.\n");
>  		error = -ENOMEM;
> -		goto err1;
> +		goto err_free_mem;
>  	}
>  
> +	tsc->poll_dev = poll_dev;
> +
> +	poll_dev->private = tsc;
> +	poll_dev->poll = tps6507x_ts_poll;
> +	poll_dev->poll_interval = init_data ?
> +			init_data->poll_period : TSC_DEFAULT_POLL_PERIOD;
> +
> +	input_dev = poll_dev->input;
>  	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
>  	input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
>  
> @@ -270,72 +270,42 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
>  	input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_10BIT, 0, 0);
>  
>  	input_dev->name = "TPS6507x Touchscreen";
> -	input_dev->id.bustype = BUS_I2C;
> -	input_dev->dev.parent = tsc->dev;
> -
> -	snprintf(tsc->phys, sizeof(tsc->phys),
> -		 "%s/input0", dev_name(tsc->dev));
>  	input_dev->phys = tsc->phys;
> -
> -	dev_dbg(tsc->dev, "device: %s\n", input_dev->phys);
> -
> -	input_set_drvdata(input_dev, tsc);
> -
> -	tsc->input_dev = input_dev;
> -
> -	INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);
> -
> +	input_dev->dev.parent = tsc->dev;
> +	input_dev->id.bustype = BUS_I2C;
>  	if (init_data) {
> -		tsc->poll_period = init_data->poll_period;
> -		tsc->min_pressure = init_data->min_pressure;
>  		input_dev->id.vendor = init_data->vendor;
>  		input_dev->id.product = init_data->product;
>  		input_dev->id.version = init_data->version;
> -	} else {
> -		tsc->poll_period = TSC_DEFAULT_POLL_PERIOD;
> -		tsc->min_pressure = TPS_DEFAULT_MIN_PRESSURE;
>  	}
>  
>  	error = tps6507x_adc_standby(tsc);
>  	if (error)
> -		goto err2;
> +		goto err_free_polled_dev;
>  
> -	error = input_register_device(input_dev);
> +	error = input_register_polled_device(poll_dev);
>  	if (error)
> -		goto err2;
> -
> -	schd = schedule_delayed_work(&tsc->work,
> -				     msecs_to_jiffies(tsc->poll_period));
> +		goto err_free_polled_dev;
>  
> -	if (!schd) {
> -		dev_err(tsc->dev, "schedule failed");
> -		goto err2;
> -	 }
> -	platform_set_drvdata(pdev, tps6507x_dev);
> +	platform_set_drvdata(pdev, tsc);
>  
>  	return 0;
>  
> -err2:
> -	cancel_delayed_work_sync(&tsc->work);
> -	input_free_device(input_dev);
> -err1:
> +err_free_polled_dev:
> +	input_free_polled_device(poll_dev);
> +err_free_mem:
>  	kfree(tsc);
> -	tps6507x_dev->ts = NULL;
> -err0:
>  	return error;
>  }
>  
>  static int tps6507x_ts_remove(struct platform_device *pdev)
>  {
> -	struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
> -	struct tps6507x_ts *tsc = tps6507x_dev->ts;
> -	struct input_dev *input_dev = tsc->input_dev;
> -
> -	cancel_delayed_work_sync(&tsc->work);
> +	struct tps6507x_ts *tsc = platform_get_drvdata(pdev);
> +	struct input_polled_dev *poll_dev = tsc->poll_dev;
>  
> -	input_unregister_device(input_dev);
> +	input_unregister_polled_device(poll_dev);
> +	input_free_polled_device(poll_dev);
>  
> -	tps6507x_dev->ts = NULL;
>  	kfree(tsc);
>  
>  	return 0;
> diff --git a/include/linux/mfd/tps6507x.h b/include/linux/mfd/tps6507x.h
> index c923e48..c2ae569 100644
> --- a/include/linux/mfd/tps6507x.h
> +++ b/include/linux/mfd/tps6507x.h
> @@ -163,7 +163,6 @@ struct tps6507x_dev {
>  
>  	/* Client devices */
>  	struct tps6507x_pmic *pmic;
> -	struct tps6507x_ts *ts;
>  };
>  
>  #endif /*  __LINUX_MFD_TPS6507X_H */
> -- 
> 1.8.1.4
> 
> 


Thanks, 
Manish

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure
  2013-06-12  7:12   ` Vishwanathrao Badarkhe, Manish
@ 2013-06-19  6:17     ` Dmitry Torokhov
  2013-07-01  6:42       ` Manish Badarkhe
  0 siblings, 1 reply; 7+ messages in thread
From: Dmitry Torokhov @ 2013-06-19  6:17 UTC (permalink / raw)
  To: Vishwanathrao Badarkhe, Manish
  Cc: linux-input@vger.kernel.org,
	davinci-linux-open-source@linux.davincidsp.com

On Wed, Jun 12, 2013 at 07:12:31AM +0000, Vishwanathrao Badarkhe, Manish wrote:
> Hi Dmitry,
> 
> On Mon, Jun 10, 2013 at 11:23:47, Dmitry Torokhov wrote:
> > There is no need to roll our own polling scheme when we already have
> > one implemented by the core.
> 
> Please let me know, on which branch this patch series is based on? 
> I failed to apply these patches on master branch of "linux-next". 

Linux-next should work, I do not have anything else for this driver
pending in my queue.

Thanks.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure
  2013-06-19  6:17     ` Dmitry Torokhov
@ 2013-07-01  6:42       ` Manish Badarkhe
  0 siblings, 0 replies; 7+ messages in thread
From: Manish Badarkhe @ 2013-07-01  6:42 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: Vishwanathrao Badarkhe, Manish,
	davinci-linux-open-source@linux.davincidsp.com,
	linux-input@vger.kernel.org, alan

Hi Dmitry,

On Wed, Jun 19, 2013 at 11:47 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>
> On Wed, Jun 12, 2013 at 07:12:31AM +0000, Vishwanathrao Badarkhe, Manish
> wrote:
> > Hi Dmitry,
> >
> > On Mon, Jun 10, 2013 at 11:23:47, Dmitry Torokhov wrote:
> > > There is no need to roll our own polling scheme when we already have
> > > one implemented by the core.
> >
> > Please let me know, on which branch this patch series is based on?
> > I failed to apply these patches on master branch of "linux-next".
>
> Linux-next should work, I do not have anything else for this driver
> pending in my queue.

Your patch series is dependant on patch [1] which is not yet applied
to master branch of "linux-next".

After applying your patch series and built kernel for da850-evm board,
I got following error:

arch/arm/mach-davinci/board-da850-evm.c:988:2: error: unknown field
'vref' specified in initializer

I resolved this error with patch [2] and tested your series with event
debug mechanism for touchscreen
functionality. Series works fine for me with above said changes.

Tested-by: Manish Badarkhe <badarkhe.manish@gmail.com>

1. https://patchwork.kernel.org/patch/1531841/
2. https://github.com/ManishBadarkhe/linux-next/commit/c18995435db8e900f97d157c6253da7f9d0e6a23

> Thanks.
>
> --
> Dmitry
> _______________________________________________
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source@linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/3] Input: tps6507x-ts - remove vref from platform data
  2013-06-10  5:53 ` [PATCH 2/3] Input: tps6507x-ts - remove vref from platform data Dmitry Torokhov
@ 2013-07-02 15:49   ` Kevin Hilman
  0 siblings, 0 replies; 7+ messages in thread
From: Kevin Hilman @ 2013-07-02 15:49 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input, davinci-linux-open-source

On Sun, Jun 9, 2013 at 10:53 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Although defined in platform data, vref is not used anywhere.
>
> Also remove model, irq, and clear_penirq as they are not used either.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Actually, it's used in arch/arm/mach-davinci/board-da850-evm.c.

The following should be folded into this patch.  Found by build
failure in linux-next building da8xx_omapl_defconfig for ARM.

Kevin

diff --git a/arch/arm/mach-davinci/board-da850-evm.c
b/arch/arm/mach-davinci/board-da850-evm.c
index 8a24b6c..bea6793 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -985,7 +985,6 @@ static struct regulator_init_data
tps65070_regulator_data[] = {
 static struct touchscreen_init_data tps6507x_touchscreen_data = {
  .poll_period =  30, /* ms between touch samples */
  .min_pressure = 0x30, /* minimum pressure to trigger touch */
- .vref = 0, /* turn off vref when not using A/D */
  .vendor = 0, /* /sys/class/input/input?/id/vendor */
  .product = 65070, /* /sys/class/input/input?/id/product */
  .version = 0x100, /* /sys/class/input/input?/id/version */

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-07-02 15:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-10  5:53 [PATCH 1/3] Input: tps6507x-ts - use bool for booleans Dmitry Torokhov
2013-06-10  5:53 ` [PATCH 2/3] Input: tps6507x-ts - remove vref from platform data Dmitry Torokhov
2013-07-02 15:49   ` Kevin Hilman
2013-06-10  5:53 ` [PATCH 3/3] Input: tps6507x-ts - convert to polled input device infrastructure Dmitry Torokhov
2013-06-12  7:12   ` Vishwanathrao Badarkhe, Manish
2013-06-19  6:17     ` Dmitry Torokhov
2013-07-01  6:42       ` Manish Badarkhe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).