From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755160Ab1HZNT3 (ORCPT ); Fri, 26 Aug 2011 09:19:29 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:56554 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755142Ab1HZNT0 (ORCPT ); Fri, 26 Aug 2011 09:19:26 -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 issue in cb_pcidda.c Date: Fri, 26 Aug 2011 18:48:58 +0530 Message-Id: <1314364738-3849-1-git-send-email-ravishankarkm32@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <[PATCH]Staging: comedi:fix printk warning issue in cb_pcidda.c> References: <[PATCH]Staging: comedi:fix printk warning issue in cb_pcidda.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_pcidda.c file that fixes up a printk warning found by the checkpatch.pl tool Signed-off-by: Ravishankar --- drivers/staging/comedi/drivers/cb_pcidda.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index 49102b3..a380ad5 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c @@ -282,7 +282,7 @@ static int cb_pcidda_attach(struct comedi_device *dev, struct pci_dev *pcidev = NULL; int index; - printk("comedi%d: cb_pcidda: ", dev->minor); + pr_info("comedi%d: cb_pcidda: ", dev->minor); /* * Allocate the private structure area. @@ -293,7 +293,7 @@ static int cb_pcidda_attach(struct comedi_device *dev, /* * Probe the device to determine what device in the series it is. */ - printk("\n"); + pr_cont("\n"); for_each_pci_dev(pcidev) { if (pcidev->vendor == PCI_VENDOR_ID_CB) { @@ -312,22 +312,23 @@ static int cb_pcidda_attach(struct comedi_device *dev, } } if (!pcidev) { - printk - ("Not a ComputerBoards/MeasurementComputing card on requested position\n"); + pr_warn("comedi%d: cb_pcidda: Not a ComputerBoards/MeasurementComputing" + " card on requested position\n", dev->minor); return -EIO; } found: devpriv->pci_dev = pcidev; dev->board_ptr = cb_pcidda_boards + index; /* "thisboard" macro can be used from here. */ - printk("Found %s at requested position\n", thisboard->name); + pr_info("comedi%d: cb_pcidda: Found %s at requested position\n", + dev->minor, thisboard->name); /* * Enable PCI device and request regions. */ if (comedi_pci_enable(pcidev, thisboard->name)) { - printk - ("cb_pcidda: failed to enable PCI device and request regions\n"); + pr_warn("comedi%d: cb_pcidda: failed to enable PCI device and request regions\n", + dev->minor); return -EIO; } @@ -377,12 +378,12 @@ found: s = dev->subdevices + 2; subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A); - printk(" eeprom:"); + pr_debug("comedi%d: cb_pcidda: eeprom:", dev->minor); for (index = 0; index < EEPROM_SIZE; index++) { devpriv->eeprom_data[index] = cb_pcidda_read_eeprom(dev, index); - printk(" %i:0x%x ", index, devpriv->eeprom_data[index]); + pr_cont(" %i:0x%x ", index, devpriv->eeprom_data[index]); } - printk("\n"); + pr_cont("\n"); /* set calibrations dacs */ for (index = 0; index < thisboard->ao_chans; index++) @@ -417,7 +418,7 @@ static int cb_pcidda_detach(struct comedi_device *dev) subdev_8255_cleanup(dev, dev->subdevices + 2); } - printk("comedi%d: cb_pcidda: remove\n", dev->minor); + pr_info("comedi%d: cb_pcidda: remove\n", dev->minor); return 0; } -- 1.7.6