All of lore.kernel.org
 help / color / mirror / Atom feed
* [lm-sensors] [PATCH] drivers/hwmon - switch to using
@ 2007-05-08  4:25 Dmitry Torokhov
  2007-05-09  3:13 ` Dmitry Torokhov
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2007-05-08  4:25 UTC (permalink / raw)
  To: lm-sensors

In preparation for struct class_device -> struct device input
core conversion, switch to using input_dev->dev.parent when
specifying device position in sysfs tree.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

 drivers/hwmon/ams/ams-input.c |    2 +-
 drivers/hwmon/hdaps.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: work/drivers/hwmon/ams/ams-input.c
=================================--- work.orig/drivers/hwmon/ams/ams-input.c
+++ work/drivers/hwmon/ams/ams-input.c
@@ -87,7 +87,7 @@ static void ams_input_enable(void)
 	ams_info.idev->id.vendor = 0;
 	ams_info.idev->open = ams_input_open;
 	ams_info.idev->close = ams_input_close;
-	ams_info.idev->cdev.dev = &ams_info.of_dev->dev;
+	ams_info.idev->dev.parent = &ams_info.of_dev->dev;
 
 	input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
 	input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0);
Index: work/drivers/hwmon/hdaps.c
=================================--- work.orig/drivers/hwmon/hdaps.c
+++ work/drivers/hwmon/hdaps.c
@@ -572,7 +572,7 @@ static int __init hdaps_init(void)
 
 	/* initialize the input class */
 	hdaps_idev->name = "hdaps";
-	hdaps_idev->cdev.dev = &pdev->dev;
+	hdaps_idev->dev.parent = &pdev->dev;
 	hdaps_idev->evbit[0] = BIT(EV_ABS);
 	input_set_abs_params(hdaps_idev, ABS_X,
 			-256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [lm-sensors] [PATCH] drivers/hwmon - switch to using
  2007-05-08  4:25 [lm-sensors] [PATCH] drivers/hwmon - switch to using Dmitry Torokhov
@ 2007-05-09  3:13 ` Dmitry Torokhov
  2007-05-10  6:13 ` Jean Delvare
  2007-05-10  7:30 ` Andrew Morton
  2 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2007-05-09  3:13 UTC (permalink / raw)
  To: lm-sensors

In preparation for struct class_device -> struct device input
core conversion, switch to using input_dev->dev.parent when
specifying device position in sysfs tree.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

[Added applesmc to the mix]

 drivers/hwmon/ams/ams-input.c |    2 +-
 drivers/hwmon/applesmc.c      |    2 +-
 drivers/hwmon/hdaps.c         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: work/drivers/hwmon/ams/ams-input.c
=================================--- work.orig/drivers/hwmon/ams/ams-input.c
+++ work/drivers/hwmon/ams/ams-input.c
@@ -87,7 +87,7 @@ static void ams_input_enable(void)
 	ams_info.idev->id.vendor = 0;
 	ams_info.idev->open = ams_input_open;
 	ams_info.idev->close = ams_input_close;
-	ams_info.idev->cdev.dev = &ams_info.of_dev->dev;
+	ams_info.idev->dev.parent = &ams_info.of_dev->dev;
 
 	input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
 	input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0);
Index: work/drivers/hwmon/hdaps.c
=================================--- work.orig/drivers/hwmon/hdaps.c
+++ work/drivers/hwmon/hdaps.c
@@ -574,7 +574,7 @@ static int __init hdaps_init(void)
 
 	/* initialize the input class */
 	hdaps_idev->name = "hdaps";
-	hdaps_idev->cdev.dev = &pdev->dev;
+	hdaps_idev->dev.parent = &pdev->dev;
 	hdaps_idev->evbit[0] = BIT(EV_ABS);
 	input_set_abs_params(hdaps_idev, ABS_X,
 			-256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
Index: work/drivers/hwmon/applesmc.c
=================================--- work.orig/drivers/hwmon/applesmc.c
+++ work/drivers/hwmon/applesmc.c
@@ -1100,7 +1100,7 @@ static int applesmc_create_accelerometer
 	/* initialize the input class */
 	applesmc_idev->name = "applesmc";
 	applesmc_idev->id.bustype = BUS_HOST;
-	applesmc_idev->cdev.dev = &pdev->dev;
+	applesmc_idev->dev.parent = &pdev->dev;
 	applesmc_idev->evbit[0] = BIT(EV_ABS);
 	applesmc_idev->open = applesmc_idev_open;
 	applesmc_idev->close = applesmc_idev_close;

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [lm-sensors] [PATCH] drivers/hwmon - switch to using
  2007-05-08  4:25 [lm-sensors] [PATCH] drivers/hwmon - switch to using Dmitry Torokhov
  2007-05-09  3:13 ` Dmitry Torokhov
@ 2007-05-10  6:13 ` Jean Delvare
  2007-05-10  7:30 ` Andrew Morton
  2 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2007-05-10  6:13 UTC (permalink / raw)
  To: lm-sensors

Hi Dmitry,

On Tue, 8 May 2007 23:13:13 -0400, Dmitry Torokhov wrote:
> In preparation for struct class_device -> struct device input
> core conversion, switch to using input_dev->dev.parent when
> specifying device position in sysfs tree.
> 
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Acked-by: Jean Delvare <khali@linux-fr.org>

> ---
> 
> [Added applesmc to the mix]
> 
>  drivers/hwmon/ams/ams-input.c |    2 +-
>  drivers/hwmon/applesmc.c      |    2 +-
>  drivers/hwmon/hdaps.c         |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> Index: work/drivers/hwmon/ams/ams-input.c
> =================================> --- work.orig/drivers/hwmon/ams/ams-input.c
> +++ work/drivers/hwmon/ams/ams-input.c
> @@ -87,7 +87,7 @@ static void ams_input_enable(void)
>  	ams_info.idev->id.vendor = 0;
>  	ams_info.idev->open = ams_input_open;
>  	ams_info.idev->close = ams_input_close;
> -	ams_info.idev->cdev.dev = &ams_info.of_dev->dev;
> +	ams_info.idev->dev.parent = &ams_info.of_dev->dev;
>  
>  	input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
>  	input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0);
> Index: work/drivers/hwmon/hdaps.c
> =================================> --- work.orig/drivers/hwmon/hdaps.c
> +++ work/drivers/hwmon/hdaps.c
> @@ -574,7 +574,7 @@ static int __init hdaps_init(void)
>  
>  	/* initialize the input class */
>  	hdaps_idev->name = "hdaps";
> -	hdaps_idev->cdev.dev = &pdev->dev;
> +	hdaps_idev->dev.parent = &pdev->dev;
>  	hdaps_idev->evbit[0] = BIT(EV_ABS);
>  	input_set_abs_params(hdaps_idev, ABS_X,
>  			-256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
> Index: work/drivers/hwmon/applesmc.c
> =================================> --- work.orig/drivers/hwmon/applesmc.c
> +++ work/drivers/hwmon/applesmc.c
> @@ -1100,7 +1100,7 @@ static int applesmc_create_accelerometer
>  	/* initialize the input class */
>  	applesmc_idev->name = "applesmc";
>  	applesmc_idev->id.bustype = BUS_HOST;
> -	applesmc_idev->cdev.dev = &pdev->dev;
> +	applesmc_idev->dev.parent = &pdev->dev;
>  	applesmc_idev->evbit[0] = BIT(EV_ABS);
>  	applesmc_idev->open = applesmc_idev_open;
>  	applesmc_idev->close = applesmc_idev_close;

Fine with me, however don't you think this patch would be better
carried through the input tree? If it goes through the hwmon tree, it
won't go upstream before 2.6.23-rc1, and you might find it difficult to
synchronize the other related input patches.

Thanks,
-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [lm-sensors] [PATCH] drivers/hwmon - switch to using
  2007-05-08  4:25 [lm-sensors] [PATCH] drivers/hwmon - switch to using Dmitry Torokhov
  2007-05-09  3:13 ` Dmitry Torokhov
  2007-05-10  6:13 ` Jean Delvare
@ 2007-05-10  7:30 ` Andrew Morton
  2 siblings, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2007-05-10  7:30 UTC (permalink / raw)
  To: lm-sensors

On Thu, 10 May 2007 08:13:10 +0200 Jean Delvare <khali@linux-fr.org> wrote:

> Hi Dmitry,
> 
> On Tue, 8 May 2007 23:13:13 -0400, Dmitry Torokhov wrote:
> > In preparation for struct class_device -> struct device input
> > core conversion, switch to using input_dev->dev.parent when
> > specifying device position in sysfs tree.
> > 
> > Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> 
> Acked-by: Jean Delvare <khali@linux-fr.org>

Thanks.

> ...
> Fine with me, however don't you think this patch would be better
> carried through the input tree? If it goes through the hwmon tree, it
> won't go upstream before 2.6.23-rc1, and you might find it difficult to
> synchronize the other related input patches.

I'll merge it in the next batch, tomorrow I guess.

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-05-10  7:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-08  4:25 [lm-sensors] [PATCH] drivers/hwmon - switch to using Dmitry Torokhov
2007-05-09  3:13 ` Dmitry Torokhov
2007-05-10  6:13 ` Jean Delvare
2007-05-10  7:30 ` Andrew Morton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.