On Mon, Mar 26, 2012 at 07:29:55PM +0800, Axel Lin wrote:
> Convert the orion_wdt driver to the watchdog framework API.
>
Hi Axel, thanks for the patch.
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
> ---
> v2: v1 does not apply to current tree. so I re-generate this patch.
> drivers/watchdog/Kconfig | 1 +
> drivers/watchdog/orion_wdt.c | 198 ++++++++++--------------------------------
> 2 files changed, 48 insertions(+), 151 deletions(-)
>
...
> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
> index 788aa15..8ba7d76 100644
> --- a/drivers/watchdog/orion_wdt.c
> +++ b/drivers/watchdog/orion_wdt.c
...
> @@ -31,7 +30,7 @@
> * Watchdog timer block registers.
> */
> #define TIMER_CTRL 0x0000
> -#define WDT_EN 0x0010
> +#define WDT_EN 0x0010
nit, whitespace change.
...
> static int __devinit orion_wdt_probe(struct platform_device *pdev)
> @@ -241,26 +146,28 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)
> struct resource *res;
> int ret;
>
> - if (pdata) {
> - wdt_tclk = pdata->tclk;
> - } else {
> + if (!pdata) {
> pr_err("misses platform data\n");
> return -ENODEV;
> }
Platform data is changing soon with devicetree support (and converting
to common clock). Please don't change this if you don't need to.
Also, I'll include Andrew Lunn in the CC. He's doing the conversion of
orion over to common clock, which affects this driver.
hth,
Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
