From patchwork Wed Apr 7 16:04:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 91082 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o37G5mPk005776 for ; Wed, 7 Apr 2010 16:05:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932898Ab0DGQFq (ORCPT ); Wed, 7 Apr 2010 12:05:46 -0400 Received: from smtp.nokia.com ([192.100.122.233]:42778 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932693Ab0DGQFm (ORCPT ); Wed, 7 Apr 2010 12:05:42 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o37G5XCD030894 for ; Wed, 7 Apr 2010 19:05:40 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 7 Apr 2010 19:05:27 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 7 Apr 2010 19:05:26 +0300 Received: from localhost.localdomain (esdhcp04088.research.nokia.com [172.21.40.88]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o37G4YNL015130; Wed, 7 Apr 2010 19:05:23 +0300 From: felipe.balbi@nokia.com To: Linux OMAP Mailing List Cc: Felipe Balbi Subject: [RFC PATCH 37/37] cbus: retu-wdt: misc cleanup on retu-wdt driver Date: Wed, 7 Apr 2010 19:04:28 +0300 Message-Id: <1270656268-7034-38-git-send-email-felipe.balbi@nokia.com> X-Mailer: git-send-email 1.7.0.rc0.33.g7c3932 In-Reply-To: <1270656268-7034-1-git-send-email-felipe.balbi@nokia.com> References: <1270656268-7034-1-git-send-email-felipe.balbi@nokia.com> X-OriginalArrivalTime: 07 Apr 2010 16:05:27.0202 (UTC) FILETIME=[23639020:01CAD66C] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Apr 2010 16:05:49 +0000 (UTC) diff --git a/drivers/cbus/retu-wdt.c b/drivers/cbus/retu-wdt.c index 53bec32..1014165 100644 --- a/drivers/cbus/retu-wdt.c +++ b/drivers/cbus/retu-wdt.c @@ -225,7 +225,7 @@ static int retu_wdt_ioctl(struct inode *inode, struct file *file, } /* Start kicking retu watchdog until user space starts doing the kicking */ -static int __init retu_wdt_ping(void) +static int __devinit retu_wdt_ping(void) { int r; @@ -243,11 +243,11 @@ static int __init retu_wdt_ping(void) } static const struct file_operations retu_wdt_fops = { - .owner = THIS_MODULE, - .write = retu_wdt_write, - .ioctl = retu_wdt_ioctl, - .open = retu_wdt_open, - .release = retu_wdt_release, + .owner = THIS_MODULE, + .write = retu_wdt_write, + .ioctl = retu_wdt_ioctl, + .open = retu_wdt_open, + .release = retu_wdt_release, }; /*----------------------------------------------------------------------------*/ @@ -269,15 +269,13 @@ static int __devinit retu_wdt_probe(struct platform_device *pdev) ret = device_create_file(&pdev->dev, &dev_attr_period); if (ret) { - printk(KERN_ERR "retu_wdt_probe: Error creating " - "sys device file: period\n"); + dev_err(&pdev->dev, "Error creating sysfs period\n"); goto free1; } ret = device_create_file(&pdev->dev, &dev_attr_counter); if (ret) { - printk(KERN_ERR "retu_wdt_probe: Error creating " - "sys device file: counter\n"); + dev_err(&pdev->dev, "Error creating sysfs counter\n"); goto free2; } @@ -298,8 +296,7 @@ static int __devinit retu_wdt_probe(struct platform_device *pdev) ret = retu_modify_counter(counter_param); if (ret == -EINVAL) { ret = retu_modify_counter(RETU_WDT_DEFAULT_TIMER); - printk(KERN_INFO - "retu_wdt_init: Intializing to default value\n"); + dev_dbg(&pdev->dev, "Initializing to default value\n"); } /* Kick the watchdog for kernel booting to finish */ @@ -307,7 +304,7 @@ static int __devinit retu_wdt_probe(struct platform_device *pdev) ret = retu_wdt_ping(); if (ret < 0) { - printk(KERN_INFO "retu_wdt_init: Failed to ping\n"); + dev_err(&pdev->dev, "Failed to ping\n"); goto free4; } @@ -333,7 +330,7 @@ static int __devexit retu_wdt_remove(struct platform_device *pdev) struct retu_wdt_dev *wdev; wdev = platform_get_drvdata(pdev); - misc_deregister(&(wdev->retu_wdt_miscdev)); + misc_deregister(&wdev->retu_wdt_miscdev); device_remove_file(&pdev->dev, &dev_attr_period); device_remove_file(&pdev->dev, &dev_attr_counter); kfree(wdev);