[PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Hans de Goede]

Since the watchdog code in sch56xx-common now uses the watchdog core, the
Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
being set.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/hwmon/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 8deedc1..3d16d66 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1036,7 +1036,7 @@ config SENSORS_SCH56XX_COMMON
 
 config SENSORS_SCH5627
 	tristate "SMSC SCH5627"
-	depends on !PPC
+	depends on !PPC && WATCHDOG
 	select SENSORS_SCH56XX_COMMON
 	help
 	  If you say yes here you get support for the hardware monitoring
@@ -1048,7 +1048,7 @@ config SENSORS_SCH5627
 
 config SENSORS_SCH5636
 	tristate "SMSC SCH5636"
-	depends on !PPC
+	depends on !PPC && WATCHDOG
 	select SENSORS_SCH56XX_COMMON
 	help
 	  SMSC SCH5636 Super I/O chips include an embedded microcontroller for
-- 
1.7.10

Re: [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Wim Van Sebroeck]

Hi Hans,

> Since the watchdog code in sch56xx-common now uses the watchdog core, the
> Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
> being set.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

I added also the "select WATCHDOG_CORE" lines for both drivers.
In linux-watchdog-next now.

Kind regards,
Wim.

Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Guenter Roeck]

On Thu, 2012-05-24 at 16:54 -0400, Wim Van Sebroeck wrote:
> Hi Hans,
> 
> > Since the watchdog code in sch56xx-common now uses the watchdog core, the
> > Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
> > being set.
> > 
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> 
> I added also the "select WATCHDOG_CORE" lines for both drivers.
> In linux-watchdog-next now.
> 
Hi Wim,

looks like Hans' patches are all in your tree, so I assume I don't have
to take anything through my hwmon tree. Please let me know if I got that
wrong.

Thanks,
Guenter

Re: [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Wim Van Sebroeck]

Hi Guenter,

> > > Since the watchdog code in sch56xx-common now uses the watchdog core, the
> > > Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
> > > being set.
> > > 
> > > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> > 
> > I added also the "select WATCHDOG_CORE" lines for both drivers.
> > In linux-watchdog-next now.
> > 
> Hi Wim,
> 
> looks like Hans' patches are all in your tree, so I assume I don't have
> to take anything through my hwmon tree. Please let me know if I got that
> wrong.

All is in my tree indeed. So you don't need to do anything on your side.

Kind regards,
Wim.


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

Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Hans de Goede]

Hi,

On 05/29/2012 06:11 PM, Guenter Roeck wrote:
> On Thu, 2012-05-24 at 16:54 -0400, Wim Van Sebroeck wrote:
>> Hi Hans,
>>
>>> Since the watchdog code in sch56xx-common now uses the watchdog core, the
>>> Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
>>> being set.
>>>
>>> Signed-off-by: Hans de Goede<hdegoede@redhat.com>
>>
>> I added also the "select WATCHDOG_CORE" lines for both drivers.
>> In linux-watchdog-next now.
>>
> Hi Wim,
>
> looks like Hans' patches are all in your tree, so I assume I don't have
> to take anything through my hwmon tree. Please let me know if I got that
> wrong.

Right, the sch56xx watchdog code conversion to the watchcore depended on
some pending watchdag core changes, so it seemed sensible to get them all
in though Wim's tree. Sorry if that caused any confusion.

Now that we've a common watchdog core, I would also like to convert the
fschmd watchdog code to it (one of these days). Which raises the question
through which tree should that conversion go in. fschmd is primarily a hwmon
driver, but the changes will only touch the watchdog part...

I guess it would be best to get the conversion in to Wim's tree, even though
that slightly increases the chance of conflicts. The fschmd driver does not see
a lot of churn, and I think Wim is a better reviewer for watchdog related
patches :)

Thanks & Regards,

Hans

Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Jean Delvare]

On Fri, 01 Jun 2012 15:37:55 +0200, Hans de Goede wrote:
> Now that we've a common watchdog core, I would also like to convert the
> fschmd watchdog code to it (one of these days). Which raises the question
> through which tree should that conversion go in. fschmd is primarily a hwmon
> driver, but the changes will only touch the watchdog part...
> 
> I guess it would be best to get the conversion in to Wim's tree, even though
> that slightly increases the chance of conflicts. The fschmd driver does not see
> a lot of churn, and I think Wim is a better reviewer for watchdog related
> patches :)

Chances of conflicts are so thin, I vote for getting it through Wim's
watchdog tree.

-- 
Jean Delvare

Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Guenter Roeck]

On Fri, Jun 01, 2012 at 10:06:57AM -0400, Jean Delvare wrote:
> On Fri, 01 Jun 2012 15:37:55 +0200, Hans de Goede wrote:
> > Now that we've a common watchdog core, I would also like to convert the
> > fschmd watchdog code to it (one of these days). Which raises the question
> > through which tree should that conversion go in. fschmd is primarily a hwmon
> > driver, but the changes will only touch the watchdog part...
> > 
> > I guess it would be best to get the conversion in to Wim's tree, even though
> > that slightly increases the chance of conflicts. The fschmd driver does not see
> > a lot of churn, and I think Wim is a better reviewer for watchdog related
> > patches :)
> 
> Chances of conflicts are so thin, I vote for getting it through Wim's
> watchdog tree.
>
Ok with me.

Guenter 

Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions

[Wim Van Sebroeck]

Hi All,

> > > Now that we've a common watchdog core, I would also like to convert the
> > > fschmd watchdog code to it (one of these days). Which raises the question
> > > through which tree should that conversion go in. fschmd is primarily a hwmon
> > > driver, but the changes will only touch the watchdog part...
> > > 
> > > I guess it would be best to get the conversion in to Wim's tree, even though
> > > that slightly increases the chance of conflicts. The fschmd driver does not see
> > > a lot of churn, and I think Wim is a better reviewer for watchdog related
> > > patches :)
> > 
> > Chances of conflicts are so thin, I vote for getting it through Wim's
> > watchdog tree.
> >
> Ok with me.

And also OK for me.

Kind regards,
Wim.