lkml.org 
[lkml]   [2011]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/24] Staging: comedi: fix printk issue in adv_pci1710.c
    Date
    This is a patch to the adv_pci1710.c file that fixes up a printk
    warning found by the checkpatch.pl tool
    Converted printks to dev_printk.
    Removed unnecessary printk statements.

    Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
    ---
    drivers/staging/comedi/drivers/adv_pci1710.c | 31 +++++++++----------------
    1 files changed, 11 insertions(+), 20 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
    index da2b75b..b6efb85 100644
    --- a/drivers/staging/comedi/drivers/adv_pci1710.c
    +++ b/drivers/staging/comedi/drivers/adv_pci1710.c
    @@ -1382,16 +1382,12 @@ static int pci1710_attach(struct comedi_device *dev,
    int i;
    int board_index;

    - printk("comedi%d: adv_pci1710: ", dev->minor);
    -
    opt_bus = it->options[0];
    opt_slot = it->options[1];

    ret = alloc_private(dev, sizeof(struct pci1710_private));
    - if (ret < 0) {
    - printk(" - Allocation failed!\n");
    + if (ret < 0)
    return -ENOMEM;
    - }

    /* Look for matching PCI device */
    errstr = "not found!";
    @@ -1436,10 +1432,10 @@ static int pci1710_attach(struct comedi_device *dev,

    if (!pcidev) {
    if (opt_bus || opt_slot) {
    - printk(" - Card at b:s %d:%d %s\n",
    - opt_bus, opt_slot, errstr);
    + dev_dbg(dev->hw_dev, "Card at b:s %d:%d %s\n",
    + opt_bus, opt_slot, errstr);
    } else {
    - printk(" - Card %s\n", errstr);
    + dev_dbg(dev->hw_dev, "Card %s\n", errstr);
    }
    return -EIO;
    }
    @@ -1450,8 +1446,8 @@ static int pci1710_attach(struct comedi_device *dev,
    irq = pcidev->irq;
    iobase = pci_resource_start(pcidev, 2);

    - printk(", b:s:f=%d:%d:%d, io=0x%4lx", pci_bus, pci_slot, pci_func,
    - iobase);
    + dev_dbg(dev->hw_dev, "b:s:f=%d:%d:%d, io=0x%4lx", pci_bus, pci_slot,
    + pci_func, iobase);

    dev->iobase = iobase;

    @@ -1471,10 +1467,8 @@ static int pci1710_attach(struct comedi_device *dev,
    n_subdevices++;

    ret = alloc_subdevices(dev, n_subdevices);
    - if (ret < 0) {
    - printk(" - Allocation failed!\n");
    + if (ret < 0)
    return ret;
    - }

    pci1710_reset(dev);

    @@ -1483,15 +1477,14 @@ static int pci1710_attach(struct comedi_device *dev,
    if (request_irq(irq, interrupt_service_pci1710,
    IRQF_SHARED, "Advantech PCI-1710",
    dev)) {
    - printk
    - (", unable to allocate IRQ %d, DISABLING IT",
    - irq);
    + dev_dbg(dev->hw_dev, "unable to allocate IRQ %d, DISABLING IT\n",
    + irq);
    irq = 0; /* Can't use IRQ */
    } else {
    - printk(", irq=%u", irq);
    + dev_dbg(dev->hw_dev, "irq=%u\n", irq);
    }
    } else {
    - printk(", IRQ disabled");
    + dev_dbg(dev->hw_dev, "IRQ disabled\n");
    }
    } else {
    irq = 0;
    @@ -1499,8 +1492,6 @@ static int pci1710_attach(struct comedi_device *dev,

    dev->irq = irq;

    - printk(".\n");
    -
    subdev = 0;

    if (this_board->n_aichan) {
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-10-19 14:09    [W:0.024 / U:29.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site