diff options
author | Joe Perches <joe@perches.com> | 2010-05-03 19:33:16 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 18:36:04 (GMT) |
commit | 694a98073f83ce1c14e3c0bba182bfeba5c44f01 (patch) | |
tree | 24971a9b53f5e2cb3a4cd737500c3e07496eac7e /drivers/staging/cxt1e1/comet.c | |
parent | 8566ea7c6f9660623a6f04bc73431f761dee32c7 (diff) | |
download | linux-fsl-qoriq-694a98073f83ce1c14e3c0bba182bfeba5c44f01.tar.xz |
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: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cxt1e1/comet.c')
-rw-r--r-- | drivers/staging/cxt1e1/comet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/cxt1e1/comet.c b/drivers/staging/cxt1e1/comet.c index b709099..dcbe6b6 100644 --- a/drivers/staging/cxt1e1/comet.c +++ b/drivers/staging/cxt1e1/comet.c @@ -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 */ } |