Commit 694a9807 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

Staging: staging/cxt1e1: Convert bare printks to pr_<level> 



Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
A few line splits for long arguments
A couple of embedded function names converted to "%s", __func__
Removed some uses of THIS_MODULE->name

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8566ea7c

drivers/staging/cxt1e1/comet.c

+5 −3
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 *   GNU General Public License for more details.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <asm/io.h>

#include <linux/hdlc.h>

#include "pmcc4_sysdep.h"
@@ -291,12 +293,12 @@ init_comet (void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster, 
        if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL)

        {

            if (log_level >= LOG_SBEBUG12)

                printk (">> init_comet: clockmaster internal clock\n");

                pr_info(">> %s: clockmaster internal clock\n", __func__);

            pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d); /* internal oscillator */

        } else                      /* external clock source */

        {

            if (log_level >= LOG_SBEBUG12)

                printk (">> init_comet: clockmaster external clock\n");

                pr_info(">> %s: clockmaster external clock\n", __func__);

            pci_write_32 ((u_int32_t *) &comet->tx_time, 0x09); /* loop timing

                                                                 * (external) */

        }
@@ -311,7 +313,7 @@ init_comet (void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster, 
        pci_write_32 ((u_int32_t *) &comet->brif_fpcfg, 0x20);  /* Slave Mode i.e.

                                                                 * FPMODE=1 (@0x20) */

        if (log_level >= LOG_SBEBUG12)

            printk (">> init_comet: clockslave internal clock\n");

            pr_info(">> %s: clockslave internal clock\n", __func__);

        pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d);     /* oscillator timing */

    }

drivers/staging/cxt1e1/functions.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ pci_read_32 (u_int32_t *p) 
    FLUSH_PCI_READ ();

    v = le32_to_cpu (*p);

    if (log_level >= LOG_DEBUG)

        printk ("pci_read : %x = %x\n", (u_int32_t) p, v);

        pr_info("pci_read : %x = %x\n", (u_int32_t) p, v);

    return v;

#else

    FLUSH_PCI_READ ();              /* */
@@ -81,7 +81,7 @@ pci_write_32 (u_int32_t *p, u_int32_t v) 
{

#ifdef FLOW_DEBUG

    if (log_level >= LOG_DEBUG)

        printk ("pci_write: %x = %x\n", (u_int32_t) p, v);

        pr_info("pci_write: %x = %x\n", (u_int32_t) p, v);

#endif

    *p = cpu_to_le32 (v);

    FLUSH_PCI_WRITE ();             /* This routine is called from routines

drivers/staging/cxt1e1/hwprobe.c

+11 −11
Original line number Diff line number Diff line
@@ -83,17 +83,17 @@ show_two (hdw_info_t * hi, int brdno) 
              (sn[5] & 0x0000ff),

             (u_int8_t) hi->revid[0]);



    printk ("%s\n", banner);

    pr_info("%s\n", banner);



    pdev = hi->pdev[0];

    printk ("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n",

    pr_info("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n",

            hi->devname, "MUSYCC",

            (unsigned long) hi->addr_mapped[0], hi->addr[0],

            hi->pci_busno, (u_int8_t) PCI_SLOT (pdev->devfn),

            (u_int8_t) PCI_FUNC (pdev->devfn), pdev->irq);



    pdev = hi->pdev[1];

    printk ("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n",

    pr_info("%s: %s at v/p=%lx/%lx (%02x:%02x.%x) irq %d\n",

            hi->devname, "EBUS  ",

            (unsigned long) hi->addr_mapped[1], hi->addr[1],

            hi->pci_busno, (u_int8_t) PCI_SLOT (pdev->devfn),
@@ -116,22 +116,22 @@ hdw_sn_get (hdw_info_t * hi, int brdno) 
    {

        unsigned char *ucp = (unsigned char *) &hi->mfg_info.data;



        printk ("eeprom[00]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

        pr_info("eeprom[00]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

                *(ucp + 0), *(ucp + 1), *(ucp + 2), *(ucp + 3), *(ucp + 4), *(ucp + 5), *(ucp + 6), *(ucp + 7));

        printk ("eeprom[08]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

        pr_info("eeprom[08]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

                *(ucp + 8), *(ucp + 9), *(ucp + 10), *(ucp + 11), *(ucp + 12), *(ucp + 13), *(ucp + 14), *(ucp + 15));

        printk ("eeprom[16]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

        pr_info("eeprom[16]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

                *(ucp + 16), *(ucp + 17), *(ucp + 18), *(ucp + 19), *(ucp + 20), *(ucp + 21), *(ucp + 22), *(ucp + 23));

        printk ("eeprom[24]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

        pr_info("eeprom[24]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

                *(ucp + 24), *(ucp + 25), *(ucp + 26), *(ucp + 27), *(ucp + 28), *(ucp + 29), *(ucp + 30), *(ucp + 31));

        printk ("eeprom[32]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

        pr_info("eeprom[32]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

                *(ucp + 32), *(ucp + 33), *(ucp + 34), *(ucp + 35), *(ucp + 36), *(ucp + 37), *(ucp + 38), *(ucp + 39));

        printk ("eeprom[40]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

        pr_info("eeprom[40]:  %02x %02x %02x %02x  %02x %02x %02x %02x\n",

                *(ucp + 40), *(ucp + 41), *(ucp + 42), *(ucp + 43), *(ucp + 44), *(ucp + 45), *(ucp + 46), *(ucp + 47));

    }

#endif

#if 0

    printk ("sn: %x %x %x %x %x %x\n",

    pr_info("sn: %x %x %x %x %x %x\n",

            hi->mfg_info.Serial[0],

            hi->mfg_info.Serial[1],

            hi->mfg_info.Serial[2],
@@ -144,7 +144,7 @@ hdw_sn_get (hdw_info_t * hi, int brdno) 
    {

        /* bad crc, data is suspect */

        if (log_level >= LOG_WARN)

            printk ("%s: EEPROM cksum error\n", hi->devname);

            pr_info("%s: EEPROM cksum error\n", hi->devname);

        hi->mfg_info_sts = EEPROM_CRCERR;

    } else

        hi->mfg_info_sts = EEPROM_OK;

drivers/staging/cxt1e1/linux.c

+15 −13
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ c4_wk_chan_restart (mch_t * ch) 
    mpi_t      *pi = ch->up;



#ifdef RLD_RESTART_DEBUG

    printk (">> c4_wk_chan_restart: queueing Port %d Chan %d, mch_t @ %p\n", pi->portnum, ch->channum, ch);

    pr_info(">> %s: queueing Port %d Chan %d, mch_t @ %p\n",

            __func__, pi->portnum, ch->channum, ch);

#endif



    /* create new entry w/in workqueue for this channel and let'er rip */
@@ -236,7 +237,8 @@ c4_wq_port_init (mpi_t * pi) 
    sprintf (np, "%s%d", pi->up->devname, pi->portnum); /* IE pmcc4-01) */



#ifdef RLD_RESTART_DEBUG

    printk (">> c4_wq_port_init: creating workqueue <%s> for Port %d.\n", name, pi->portnum); /* RLD DEBUG */

    pr_info(">> %s: creating workqueue <%s> for Port %d.\n",

            __func__, name, pi->portnum); /* RLD DEBUG */

#endif

    if (!(pi->wq_port = create_singlethread_workqueue (name)))

        return ENOMEM;
@@ -284,7 +286,7 @@ c4_ebus_interrupt (int irq, void *dev_instance) 
static int

void_open (struct net_device * ndev)

{

    printk ("%s: trying to open master device !\n", ndev->name);

    pr_info("%s: trying to open master device !\n", ndev->name);

    return -1;

}
@@ -317,7 +319,7 @@ chan_open (struct net_device * ndev) 
    hdlc->proto = IF_PROTO_HDLC;

    if ((ret = hdlc_open (hdlc)))

    {

        printk ("%s: hdlc_open failure, err %d.\n", THIS_MODULE->name, ret);

        pr_info("hdlc_open failure, err %d.\n", ret);

        return ret;

    }

    if ((ret = c4_chan_up (DEV_TO_PRIV (hdlc)->ci, DEV_TO_PRIV (hdlc)->channum)))
@@ -340,7 +342,7 @@ chan_open (struct net_device * ndev) 


    if ((ret = hdlc_open (ndev)))

    {

        printk ("%s: hdlc_open failure, err %d.\n", THIS_MODULE->name, ret);

        pr_info("hdlc_open failure, err %d.\n", ret);

        return ret;

    }

    if ((ret = c4_chan_up (priv->ci, priv->channum)))
@@ -629,7 +631,7 @@ create_chan (struct net_device * ndev, ci_t * ci, 
    if (ret)

    {

        if (log_level >= LOG_WARN)

            printk ("%s: create_chan[%d] registration error = %d.\n",

            pr_info("%s: create_chan[%d] registration error = %d.\n",

                    ci->devname, cp->channum, ret);

        free_netdev (dev);          /* cleanup */

        return 0;                   /* failed to register */
@@ -1018,7 +1020,7 @@ c4_ioctl (struct net_device * ndev, struct ifreq * ifr, int cmd) 
#endif



#if 0

    printk ("c4_ioctl: iocmd %x, dir %x type %x nr %x iolen %d.\n", iocmd,

    pr_info("c4_ioctl: iocmd %x, dir %x type %x nr %x iolen %d.\n", iocmd,

            _IOC_DIR (iocmd), _IOC_TYPE (iocmd), _IOC_NR (iocmd),

            _IOC_SIZE (iocmd));

#endif
@@ -1031,23 +1033,23 @@ c4_ioctl (struct net_device * ndev, struct ifreq * ifr, int cmd) 
    switch (iocmd)

    {

    case SBE_IOC_PORT_GET:

        //printk (">> SBE_IOC_PORT_GET Ioctl...\n");

        //pr_info(">> SBE_IOC_PORT_GET Ioctl...\n");

        ret = do_get_port (ndev, data);

        break;

    case SBE_IOC_PORT_SET:

        //printk (">> SBE_IOC_PORT_SET Ioctl...\n");

        //pr_info(">> SBE_IOC_PORT_SET Ioctl...\n");

        ret = do_set_port (ndev, data);

        break;

    case SBE_IOC_CHAN_GET:

        //printk (">> SBE_IOC_CHAN_GET Ioctl...\n");

        //pr_info(">> SBE_IOC_CHAN_GET Ioctl...\n");

        ret = do_get_chan (ndev, data);

        break;

    case SBE_IOC_CHAN_SET:

        //printk (">> SBE_IOC_CHAN_SET Ioctl...\n");

        //pr_info(">> SBE_IOC_CHAN_SET Ioctl...\n");

        ret = do_set_chan (ndev, data);

        break;

    case C4_DEL_CHAN:

        //printk (">> C4_DEL_CHAN Ioctl...\n");

        //pr_info(">> C4_DEL_CHAN Ioctl...\n");

        ret = do_del_chan (ndev, data);

        break;

    case SBE_IOC_CHAN_NEW:
@@ -1084,7 +1086,7 @@ c4_ioctl (struct net_device * ndev, struct ifreq * ifr, int cmd) 
                return -EFAULT;

        break;

    default:

        //printk (">> c4_ioctl: EINVAL - unknown iocmd <%x>\n", iocmd);

        //pr_info(">> c4_ioctl: EINVAL - unknown iocmd <%x>\n", iocmd);

        ret = -EINVAL;

        break;

    }

drivers/staging/cxt1e1/musycc.c

+66 −62

File changed.

Preview size limit exceeded, changes collapsed.