Commit fb551405 authored by Hans de Goede's avatar Hans de Goede Committed by Wim Van Sebroeck

watchdog: sch56xx: Use watchdog core

Convert sch56xx drivers to the generic watchdog core.

Note this patch depends on the "watchdog: Add multiple device support" patch
from Alan Cox.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent e907df32
...@@ -579,7 +579,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev) ...@@ -579,7 +579,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
} }
/* Note failing to register the watchdog is not a fatal error */ /* Note failing to register the watchdog is not a fatal error */
data->watchdog = sch56xx_watchdog_register(data->addr, data->watchdog = sch56xx_watchdog_register(&pdev->dev, data->addr,
(build_code << 24) | (build_id << 8) | hwmon_rev, (build_code << 24) | (build_id << 8) | hwmon_rev,
&data->update_lock, 1); &data->update_lock, 1);
......
...@@ -510,7 +510,7 @@ static int __devinit sch5636_probe(struct platform_device *pdev) ...@@ -510,7 +510,7 @@ static int __devinit sch5636_probe(struct platform_device *pdev)
} }
/* Note failing to register the watchdog is not a fatal error */ /* Note failing to register the watchdog is not a fatal error */
data->watchdog = sch56xx_watchdog_register(data->addr, data->watchdog = sch56xx_watchdog_register(&pdev->dev, data->addr,
(revision[0] << 8) | revision[1], (revision[0] << 8) | revision[1],
&data->update_lock, 0); &data->update_lock, 0);
......
This diff is collapsed.
...@@ -27,6 +27,6 @@ int sch56xx_read_virtual_reg16(u16 addr, u16 reg); ...@@ -27,6 +27,6 @@ int sch56xx_read_virtual_reg16(u16 addr, u16 reg);
int sch56xx_read_virtual_reg12(u16 addr, u16 msb_reg, u16 lsn_reg, int sch56xx_read_virtual_reg12(u16 addr, u16 msb_reg, u16 lsn_reg,
int high_nibble); int high_nibble);
struct sch56xx_watchdog_data *sch56xx_watchdog_register( struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,
u16 addr, u32 revision, struct mutex *io_lock, int check_enabled); u16 addr, u32 revision, struct mutex *io_lock, int check_enabled);
void sch56xx_watchdog_unregister(struct sch56xx_watchdog_data *data); void sch56xx_watchdog_unregister(struct sch56xx_watchdog_data *data);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment