From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754799Ab1HZNJR (ORCPT ); Fri, 26 Aug 2011 09:09:17 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:47447 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754230Ab1HZNJR (ORCPT ); Fri, 26 Aug 2011 09:09:17 -0400 From: Ravishankar To: gregkh@suse.de, wfp5p@virginia.edu Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Ravishankar , Ravishankar Subject: [PATCH] Staging: comedi: fix printk warning issue in cb_pcidas64.c Date: Fri, 26 Aug 2011 18:38:52 +0530 Message-Id: <1314364132-3545-1-git-send-email-ravishankarkm32@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <[PATCH]Staging: comedi:fix printk issue in cb_pcidas64.c> References: <[PATCH]Staging: comedi:fix printk issue in cb_pcidas64.c> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ravishankar This is a patch to the cb_pcidas64.c file that fixes up a printk warning found by the checkpatch.pl tool Signed-off-by: Ravishankar --- drivers/staging/comedi/drivers/cb_pcidas64.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 1e32419..37a0402 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1739,7 +1739,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it) uint32_t local_range, local_decode; int retval; - printk("comedi%d: cb_pcidas64\n", dev->minor); + pr_info("comedi%d: cb_pcidas64\n", dev->minor); /* * Allocate the private structure area. @@ -1776,17 +1776,15 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it) } if (dev->board_ptr == NULL) { - printk - ("No supported ComputerBoards/MeasurementComputing card found\n"); + pr_warn("No supported ComputerBoards/MeasurementComputing card found\n"); return -EIO; } - printk("Found %s on bus %i, slot %i\n", board(dev)->name, - pcidev->bus->number, PCI_SLOT(pcidev->devfn)); + pr_info("Found %s on bus %i, slot %i\n", board(dev)->name, + pcidev->bus->number, PCI_SLOT(pcidev->devfn)); if (comedi_pci_enable(pcidev, driver_cb_pcidas.driver_name)) { - printk(KERN_WARNING - " failed to enable PCI device and request regions\n"); + pr_warn(" failed to enable PCI device and request regions\n"); return -EIO; } pci_set_master(pcidev); @@ -1813,10 +1811,8 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it) pci_resource_len(pcidev, DIO_COUNTER_BADDRINDEX)); if (!priv(dev)->plx9080_iobase || !priv(dev)->main_iobase - || !priv(dev)->dio_counter_iobase) { - printk(" failed to remap io memory\n"); + || !priv(dev)->dio_counter_iobase) return -ENOMEM; - } DEBUG_PRINT(" plx9080 remapped to 0x%p\n", priv(dev)->plx9080_iobase); DEBUG_PRINT(" main remapped to 0x%p\n", priv(dev)->main_iobase); @@ -1850,17 +1846,15 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it) priv(dev)->hw_revision = hw_revision(dev, readw(priv(dev)->main_iobase + HW_STATUS_REG)); - printk(" stc hardware revision %i\n", priv(dev)->hw_revision); init_plx9080(dev); init_stc_registers(dev); /* get irq */ if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED, "cb_pcidas64", dev)) { - printk(" unable to allocate irq %u\n", pcidev->irq); + pr_warn(" unable to allocate irq %u\n", pcidev->irq); return -EINVAL; } dev->irq = pcidev->irq; - printk(" irq %u\n", dev->irq); retval = setup_subdevices(dev); if (retval < 0) @@ -1882,7 +1876,7 @@ static int detach(struct comedi_device *dev) { unsigned int i; - printk("comedi%d: cb_pcidas: remove\n", dev->minor); + pr_info("comedi%d: cb_pcidas: remove\n", dev->minor); if (dev->irq) free_irq(dev->irq, dev); -- 1.7.6