* linux-next: Tree for May 3
@ 2010-05-03 5:16 Stephen Rothwell
2010-05-03 17:06 ` [PATCH -next] power: fix block_io.c printk warning Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Stephen Rothwell @ 2010-05-03 5:16 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 11210 bytes --]
Hi all,
Changes since 20100430:
Dropped trees: tmio-mmc (long unresolved conflicts and unable to fetch)
hwlat (at the maintainer's request)
My fixes tree is empty.
The usb.current tree lost its conflict.
The v4l-dvb tree still has its build failure, so I used the version from
next-20100409.
The net tree gained a build failure so I used the version from
next-20100430.
The bk-ioctl tree lost its build failure and 2 conflicts.
The driver-core tree gained a build failure for which I applied a patch.
The usb tree lost two of its build failures bit still has one more for
which I have reverted a commit.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 162 trees (counting Linus' and 22 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Applying: ar9170: fix for driver-core ABI change
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Applying: staging: update gfp/slab.h includes
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: arm: update gfp/slab.h includes
Merging davinci/davinci-next
Applying: davinci: update gfp/slab.h includes
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Applying: ocfs2: update gfp/slab.h includes
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in fs/9p/vfs_super.c
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/cifs/file.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/nfs/inode.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
CONFLICT (content): Merge conflict in fs/nfsd/vfs.c
CONFLICT (content): Merge conflict in fs/ufs/inode.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/input/input.c
Applying: v4l-dvb: update gfp/slab.h includes
$ git reset --hard HEAD^
Merging refs/next/20100409/v4l-dvb
CONFLICT (content): Merge conflict in drivers/media/video/meye.c
CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c
Applying: v4l-dvb: update gfp/slab.h includes
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: update gfp/slab.h includes
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Applying: kvm: powerpc: use of kzalloc/kfree requires including slab.h
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/scsi/iscsi_tcp.c
$ git reset --hard HEAD^
Merging refs/next/20100430/net
CONFLICT (content): Merge conflict in drivers/scsi/iscsi_tcp.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/cmd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/main.c
Applying: wireless: update gfp/slab.h includes
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Applying: mtd: update gfp/slab.h includes
Merging crypto/master
CONFLICT (content): Merge conflict in drivers/crypto/mv_cesa.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext3/fsync.c
CONFLICT (content): Merge conflict in fs/ext4/fsync.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Applying: kgdb: update for sysrq handling change
Applying: kdb: update gfp/slab.h includes
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Applying: vbus: use of kzalloc/kfree requires the include of slab.h
Applying: vbus: update gfp/slab.h includes
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Applying: lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
CONFLICT (content): Merge conflict in arch/cris/arch-v10/drivers/ds1302.c
CONFLICT (content): Merge conflict in drivers/block/pktcdvd.c
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/platform.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/quatech_daqp_cs.c
Applying: md: fixup for sysfs_get_dirent API change
Merging quilt/tty
CONFLICT (content): Merge conflict in include/linux/tty.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/input/tablet/acecad.c
CONFLICT (content): Merge conflict in drivers/input/tablet/kbtab.c
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_sys.c
CONFLICT (delete/modify): sound/usb/usbaudio.c deleted in HEAD and modified in quilt/usb. Version quilt/usb of sound/usb/usbaudio.c left in tree.
$ git rm -f sound/usb/usbaudio.c
Applying: usb: update gfp/slab.h includes
Applying: sound: fixup for usb_buffer_alloc/free rename
Merging staging-next/staging-next
CONFLICT (content): Merge conflict in drivers/staging/arlan/arlan-main.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-alsa.c
CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c
CONFLICT (content): Merge conflict in drivers/staging/netwave/netwave_cs.c
Merging slabh/slabh
Merging scsi-post-merge/master
[master 528af62] Revert "usb: otg: twl4030: use the global ULPI register definitions"
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH -next] power: fix block_io.c printk warning
2010-05-03 5:16 linux-next: Tree for May 3 Stephen Rothwell
@ 2010-05-03 17:06 ` Randy Dunlap
2010-05-03 22:00 ` Rafael J. Wysocki
2010-05-03 17:07 ` [PATCH -next] usbserial: fix mos7720 dependencies Randy Dunlap
2010-05-03 17:09 ` [PATCH -next] staging: fix cxt1e1 module names Randy Dunlap
2 siblings, 1 reply; 10+ messages in thread
From: Randy Dunlap @ 2010-05-03 17:06 UTC (permalink / raw)
To: Stephen Rothwell, Rafael J. Wysocki; +Cc: linux-next, LKML, linux-pm
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix printk format warning in block_io.c:
kernel/power/block_io.c:41: warning: format '%ld' expects type 'long int', but argument 2 has type 'sector_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
---
kernel/power/block_io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20100503.orig/kernel/power/block_io.c
+++ linux-next-20100503/kernel/power/block_io.c
@@ -37,8 +37,8 @@ static int submit(int rw, struct block_d
bio->bi_end_io = end_swap_bio_read;
if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
- printk(KERN_ERR "PM: Adding page to bio failed at %ld\n",
- sector);
+ printk(KERN_ERR "PM: Adding page to bio failed at %llu\n",
+ (unsigned long long)sector);
bio_put(bio);
return -EFAULT;
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH -next] usbserial: fix mos7720 dependencies
2010-05-03 5:16 linux-next: Tree for May 3 Stephen Rothwell
2010-05-03 17:06 ` [PATCH -next] power: fix block_io.c printk warning Randy Dunlap
@ 2010-05-03 17:07 ` Randy Dunlap
2010-05-03 17:09 ` [PATCH -next] staging: fix cxt1e1 module names Randy Dunlap
2 siblings, 0 replies; 10+ messages in thread
From: Randy Dunlap @ 2010-05-03 17:07 UTC (permalink / raw)
To: Stephen Rothwell, gregkh; +Cc: linux-next, LKML, lud
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix mos7720 Kconfig dependencies.
When an enabled bool selects a tristate, the tristate becomes =y,
even if it should be limited to modular, so limit the bool kconfig
option to configs that will build cleanly.
Also change the if-block to a simple depends on.
drivers/built-in.o: In function `mos7720_release':
mos7720.c:(.text+0xad432): undefined reference to `parport_remove_port'
drivers/built-in.o: In function `mos7715_parport_init':
mos7720.c:(.text+0xae197): undefined reference to `parport_register_port'
mos7720.c:(.text+0xae210): undefined reference to `parport_announce_port'
drivers/built-in.o:(.data+0x201c8): undefined reference to `parport_ieee1284_read_nibble'
drivers/built-in.o:(.data+0x201d0): undefined reference to `parport_ieee1284_read_byte'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/usb/serial/Kconfig | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- linux-next-20100503.orig/drivers/usb/serial/Kconfig
+++ linux-next-20100503/drivers/usb/serial/Kconfig
@@ -425,16 +425,15 @@ config USB_SERIAL_MOS7720
To compile this driver as a module, choose M here: the
module will be called mos7720.
-if USB_SERIAL_MOS7720
config USB_SERIAL_MOS7715_PARPORT
bool "Support for parallel port on the Moschip 7715"
+ depends on USB_SERIAL_MOS7720
+ depends on PARPORT=y || PARPORT=USB_SERIAL_MOS7720
select PARPORT_NOT_PC
- depends on PARPORT
---help---
Say Y if you have a Moschip 7715 device and would like to use
the parallel port it provides. The port will register with
the parport subsystem as a low-level driver.
-endif
config USB_SERIAL_MOS7840
tristate "USB Moschip 7840/7820 USB Serial Driver"
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH -next] staging: fix cxt1e1 module names
2010-05-03 5:16 linux-next: Tree for May 3 Stephen Rothwell
2010-05-03 17:06 ` [PATCH -next] power: fix block_io.c printk warning Randy Dunlap
2010-05-03 17:07 ` [PATCH -next] usbserial: fix mos7720 dependencies Randy Dunlap
@ 2010-05-03 17:09 ` Randy Dunlap
2010-05-03 18:02 ` Joe Perches
2 siblings, 1 reply; 10+ messages in thread
From: Randy Dunlap @ 2010-05-03 17:09 UTC (permalink / raw)
To: Stephen Rothwell, gregkh, devel; +Cc: linux-next, LKML, support, support
From: Randy Dunlap <randy.dunlap@oracle.com>
Lots of cxt1e1 source code uses THIS_MODULE->name, which won't build
when CONFIG_MODULES is not enabled, so use KBUILD_MODNAME instead.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: support@sbei.com
Cc: support@onestopsystems.com
---
drivers/staging/cxt1e1/hwprobe.c | 9 +++++----
drivers/staging/cxt1e1/linux.c | 16 ++++++++--------
drivers/staging/cxt1e1/musycc.c | 4 ++--
drivers/staging/cxt1e1/pmcc4_drv.c | 13 ++++++++-----
drivers/staging/cxt1e1/sbeproc.c | 4 ++--
5 files changed, 25 insertions(+), 21 deletions(-)
--- linux-next-20100503.orig/drivers/staging/cxt1e1/musycc.c
+++ linux-next-20100503/drivers/staging/cxt1e1/musycc.c
@@ -960,13 +960,13 @@ musycc_init (ci_t * ci)
if (max_mru > 0xffe)
{
printk (KERN_WARNING "%s: Maximum allowed MRU exceeded, resetting %d to %d.\n",
- THIS_MODULE->name, max_mru, 0xffe);
+ KBUILD_MODNAME, max_mru, 0xffe);
max_mru = 0xffe;
}
if (max_mtu > 0xffe)
{
printk (KERN_WARNING "%s: Maximum allowed MTU exceeded, resetting %d to %d.\n",
- THIS_MODULE->name, max_mtu, 0xffe);
+ KBUILD_MODNAME, max_mtu, 0xffe);
max_mtu = 0xffe;
}
#ifdef SBE_WAN256T3_ENABLE
--- linux-next-20100503.orig/drivers/staging/cxt1e1/pmcc4_drv.c
+++ linux-next-20100503/drivers/staging/cxt1e1/pmcc4_drv.c
@@ -171,10 +171,11 @@ sbecom_set_loglevel (int d)
{
if (log_level != d)
{
- printk ("%s: log level changed from %d to %d\n", THIS_MODULE->name, log_level, d);
+ printk ("%s: log level changed from %d to %d\n",
+ KBUILD_MODNAME, log_level, d);
log_level = d; /* set new */
} else
- printk ("%s: log level is %d\n", THIS_MODULE->name, log_level);
+ printk ("%s: log level is %d\n", KBUILD_MODNAME, log_level);
}
}
@@ -221,7 +222,7 @@ c4_new (void *hi)
ci->brdno = ci->next ? ci->next->brdno + 1 : 0;
} else
printk (KERN_WARNING "%s: failed CI malloc, size %u.\n",
- THIS_MODULE->name, (unsigned int) sizeof (ci_t));
+ KBUILD_MODNAME, (unsigned int) sizeof (ci_t));
if (CI == 0)
CI = ci; /* DEBUG, only board 0 usage */
@@ -545,7 +546,8 @@ c4_watchdog (ci_t * ci)
if (drvr_state != SBE_DRVR_AVAILABLE)
{
if (log_level >= LOG_MONITOR)
- printk ("%s: drvr not available (%x)\n", THIS_MODULE->name, drvr_state);
+ printk ("%s: drvr not available (%x)\n",
+ KBUILD_MODNAME, drvr_state);
return;
}
#if 0
@@ -848,7 +850,8 @@ c4_init (ci_t * ci, u_char *func0, u_cha
} else
{
printk (KERN_WARNING "%s: failed mch_t malloc, port %d channel %d size %u.\n",
- THIS_MODULE->name, portnum, j, (unsigned int) sizeof (mch_t));
+ KBUILD_MODNAME, portnum, j,
+ (unsigned int) sizeof (mch_t));
break;
}
}
--- linux-next-20100503.orig/drivers/staging/cxt1e1/linux.c
+++ linux-next-20100503/drivers/staging/cxt1e1/linux.c
@@ -338,7 +338,7 @@ chan_open (struct net_device * ndev)
if ((ret = hdlc_open (ndev)))
{
- printk ("%s: hdlc_open failure, err %d.\n", THIS_MODULE->name, ret);
+ printk ("%s: hdlc_open failure, err %d.\n", KBUILD_MODNAME, ret);
return ret;
}
if ((ret = c4_chan_up (priv->ci, priv->channum)))
@@ -1263,33 +1263,33 @@ c4_mod_init (void)
{
int rtn;
- printk (KERN_WARNING "%s: %s\n", THIS_MODULE->name, pmcc4_OSSI_release);
+ printk (KERN_WARNING "%s: %s\n", KBUILD_MODNAME, pmcc4_OSSI_release);
if ((rtn = c4hw_attach_all ()))
return -rtn; /* installation failure - see system log */
/* housekeeping notifications */
if (log_level != log_level_default)
printk (KERN_INFO "%s NOTE: driver parameter <log_level> changed from default %d to %d.\n",
- THIS_MODULE->name, log_level_default, log_level);
+ KBUILD_MODNAME, log_level_default, log_level);
if (max_mru != max_mru_default)
printk (KERN_INFO "%s NOTE: driver parameter <max_mru> changed from default %d to %d.\n",
- THIS_MODULE->name, max_mru_default, max_mru);
+ KBUILD_MODNAME, max_mru_default, max_mru);
if (max_mtu != max_mtu_default)
printk (KERN_INFO "%s NOTE: driver parameter <max_mtu> changed from default %d to %d.\n",
- THIS_MODULE->name, max_mtu_default, max_mtu);
+ KBUILD_MODNAME, max_mtu_default, max_mtu);
if (max_rxdesc_used != max_rxdesc_default)
{
if (max_rxdesc_used > 2000)
max_rxdesc_used = 2000; /* out-of-bounds reset */
printk (KERN_INFO "%s NOTE: driver parameter <max_rxdesc_used> changed from default %d to %d.\n",
- THIS_MODULE->name, max_rxdesc_default, max_rxdesc_used);
+ KBUILD_MODNAME, max_rxdesc_default, max_rxdesc_used);
}
if (max_txdesc_used != max_txdesc_default)
{
if (max_txdesc_used > 1000)
max_txdesc_used = 1000; /* out-of-bounds reset */
printk (KERN_INFO "%s NOTE: driver parameter <max_txdesc_used> changed from default %d to %d.\n",
- THIS_MODULE->name, max_txdesc_default, max_txdesc_used);
+ KBUILD_MODNAME, max_txdesc_default, max_txdesc_used);
}
return 0; /* installation success */
}
@@ -1331,7 +1331,7 @@ c4_mod_remove (void)
cleanup_devs ();
c4_cleanup ();
cleanup_ioremap ();
- printk (KERN_INFO "SBE %s - driver removed.\n", THIS_MODULE->name);
+ printk (KERN_INFO "SBE %s - driver removed.\n", KBUILD_MODNAME);
}
module_init (c4_mod_init);
--- linux-next-20100503.orig/drivers/staging/cxt1e1/sbeproc.c
+++ linux-next-20100503/drivers/staging/cxt1e1/sbeproc.c
@@ -319,7 +319,7 @@ sbecom_proc_brd_init (ci_t * ci)
if (!ci->dir_dev)
{
printk (KERN_ERR "%s: Unable to create directory /proc/driver/%s\n",
- THIS_MODULE->name, ci->devname);
+ KBUILD_MODNAME, ci->devname);
goto fail;
}
e = create_proc_read_entry ("info", S_IFREG | S_IRUGO,
@@ -327,7 +327,7 @@ sbecom_proc_brd_init (ci_t * ci)
if (!e)
{
printk (KERN_ERR "%s: Unable to create entry /proc/driver/%s/info\n",
- THIS_MODULE->name, ci->devname);
+ KBUILD_MODNAME, ci->devname);
goto fail;
}
return 0;
--- linux-next-20100503.orig/drivers/staging/cxt1e1/hwprobe.c
+++ linux-next-20100503/drivers/staging/cxt1e1/hwprobe.c
@@ -230,7 +230,8 @@ c4_hdw_init (struct pci_dev * pdev, int
/* our MUSYCC chip supports two functions, 0 & 1 */
if ((fun = PCI_FUNC (pdev->devfn)) > 1)
{
- printk (KERN_WARNING "%s: unexpected devfun: 0x%x\n", THIS_MODULE->name, pdev->devfn);
+ printk (KERN_WARNING "%s: unexpected devfun: 0x%x\n",
+ KBUILD_MODNAME, pdev->devfn);
return 0;
}
if (pdev->bus) /* obtain bus number */
@@ -260,7 +261,7 @@ c4_hdw_init (struct pci_dev * pdev, int
* exceeded */
{
printk (KERN_WARNING "%s: exceeded number of allowed devices (>%d)?\n",
- THIS_MODULE->name, MAX_BOARDS);
+ KBUILD_MODNAME, MAX_BOARDS);
return 0;
}
if (pdev->bus)
@@ -282,7 +283,7 @@ c4_hdw_init (struct pci_dev * pdev, int
*/
char *cp = hi->devname;
- strcpy (cp, THIS_MODULE->name);
+ strcpy (cp, KBUILD_MODNAME);
cp += strlen (cp); /* reposition */
*cp++ = '-';
*cp++ = '0' + (found / 2); /* there are two found interfaces per
@@ -319,7 +320,7 @@ c4hw_attach_all (void)
}
if (!found)
{
- printk (KERN_WARNING "%s: No boards found.\n", THIS_MODULE->name);
+ printk (KERN_WARNING "%s: No boards found.\n", KBUILD_MODNAME);
return ENODEV;
}
/* sanity check for consistant hardware found */
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] staging: fix cxt1e1 module names
2010-05-03 17:09 ` [PATCH -next] staging: fix cxt1e1 module names Randy Dunlap
@ 2010-05-03 18:02 ` Joe Perches
2010-05-03 18:06 ` Randy Dunlap
0 siblings, 1 reply; 10+ messages in thread
From: Joe Perches @ 2010-05-03 18:02 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, gregkh, devel, linux-next, LKML, support,
support
On Mon, 2010-05-03 at 10:09 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Lots of cxt1e1 source code uses THIS_MODULE->name, which won't build
> when CONFIG_MODULES is not enabled, so use KBUILD_MODNAME instead.
Perhaps a conversion to pr_<level> is better?
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/staging/cxt1e1/functions.c | 4 ++-
drivers/staging/cxt1e1/hwprobe.c | 28 ++++++++++---------
drivers/staging/cxt1e1/linux.c | 38 +++++++++++++-------------
drivers/staging/cxt1e1/musycc.c | 13 +++++----
drivers/staging/cxt1e1/pmcc4_drv.c | 16 ++++++-----
drivers/staging/cxt1e1/sbecom_inline_linux.h | 2 +-
drivers/staging/cxt1e1/sbeproc.c | 8 +++---
7 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/cxt1e1/functions.c b/drivers/staging/cxt1e1/functions.c
index c95c62d..738129d 100644
--- a/drivers/staging/cxt1e1/functions.c
+++ b/drivers/staging/cxt1e1/functions.c
@@ -11,6 +11,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/byteorder.h>
@@ -117,7 +119,7 @@ watchdog_func (unsigned long arg)
if (drvr_state != SBE_DRVR_AVAILABLE)
{
if (log_level >= LOG_MONITOR)
- printk (KERN_WARNING "watchdog_func: drvr not available (%x)\n", drvr_state);
+ pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state);
return;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
index 0f9d653..571fa1f 100644
--- a/drivers/staging/cxt1e1/hwprobe.c
+++ b/drivers/staging/cxt1e1/hwprobe.c
@@ -12,6 +12,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/netdevice.h>
#include <linux/hdlc.h>
#include <linux/if_arp.h>
@@ -230,7 +232,7 @@ c4_hdw_init (struct pci_dev * pdev, int found)
/* our MUSYCC chip supports two functions, 0 & 1 */
if ((fun = PCI_FUNC (pdev->devfn)) > 1)
{
- printk (KERN_WARNING "%s: unexpected devfun: 0x%x\n", THIS_MODULE->name, pdev->devfn);
+ pr_warning("unexpected devfun: 0x%x\n", pdev->devfn);
return 0;
}
if (pdev->bus) /* obtain bus number */
@@ -259,8 +261,7 @@ c4_hdw_init (struct pci_dev * pdev, int found)
if (i == MAX_BOARDS) /* no match in above loop means MAX
* exceeded */
{
- printk (KERN_WARNING "%s: exceeded number of allowed devices (>%d)?\n",
- THIS_MODULE->name, MAX_BOARDS);
+ pr_warning("exceeded number of allowed devices (>%d)?\n", MAX_BOARDS);
return 0;
}
if (pdev->bus)
@@ -319,7 +320,7 @@ c4hw_attach_all (void)
}
if (!found)
{
- printk (KERN_WARNING "%s: No boards found.\n", THIS_MODULE->name);
+ pr_warning("No boards found\n");
return ENODEV;
}
/* sanity check for consistant hardware found */
@@ -327,7 +328,8 @@ c4hw_attach_all (void)
{
if (hi->pci_slot != 0xff && (!hi->addr[0] || !hi->addr[1]))
{
- printk (KERN_WARNING "%s: something very wrong with pci_get_device.\n", hi->devname);
+ pr_warning("%s: something very wrong with pci_get_device\n",
+ hi->devname);
return EIO;
}
}
@@ -340,22 +342,22 @@ c4hw_attach_all (void)
{
if (request_mem_region (hi->addr[j], hi->len[j], hi->devname) == 0)
{
- printk (KERN_WARNING "%s: memory in use, addr=0x%lx, len=0x%lx ?\n",
- hi->devname, hi->addr[j], hi->len[j]);
+ pr_warning("%s: memory in use, addr=0x%lx, len=0x%lx ?\n",
+ hi->devname, hi->addr[j], hi->len[j]);
cleanup_ioremap ();
return ENOMEM;
}
hi->addr_mapped[j] = (unsigned long) ioremap (hi->addr[j], hi->len[j]);
if (!hi->addr_mapped[j])
{
- printk (KERN_WARNING "%s: ioremap fails, addr=0x%lx, len=0x%lx ?\n",
- hi->devname, hi->addr[j], hi->len[j]);
+ pr_warning("%s: ioremap fails, addr=0x%lx, len=0x%lx ?\n",
+ hi->devname, hi->addr[j], hi->len[j]);
cleanup_ioremap ();
return ENOMEM;
}
#ifdef SBE_MAP_DEBUG
- printk (KERN_WARNING "%s: io remapped from phys %x to virt %x\n",
- hi->devname, (u_int32_t) hi->addr[j], (u_int32_t) hi->addr_mapped[j]);
+ pr_warning("%s: io remapped from phys %x to virt %x\n",
+ hi->devname, (u_int32_t) hi->addr[j], (u_int32_t) hi->addr_mapped[j]);
#endif
}
}
@@ -371,8 +373,8 @@ c4hw_attach_all (void)
pci_enable_device (hi->pdev[1]))
{
drvr_state = SBE_DRVR_DOWN;
- printk (KERN_WARNING "%s: failed to enable card %d slot %d\n",
- hi->devname, i, hi->pci_slot);
+ pr_warning("%s: failed to enable card %d slot %d\n",
+ hi->devname, i, hi->pci_slot);
cleanup_devs ();
cleanup_ioremap ();
return EIO;
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index aee7018..ce2942c 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -12,6 +12,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/hdlc.h>
@@ -563,13 +565,13 @@ create_chan (struct net_device * ndev, ci_t * ci,
priv = OS_kmalloc (sizeof (struct c4_priv));
if (!priv)
{
- printk (KERN_WARNING "%s: no memory for net_device !\n", ci->devname);
+ pr_warning("%s: no memory for net_device !\n", ci->devname);
return 0;
}
dev = alloc_hdlcdev (priv);
if (!dev)
{
- printk (KERN_WARNING "%s: no memory for hdlc_device !\n", ci->devname);
+ pr_warning("%s: no memory for hdlc_device !\n", ci->devname);
OS_kfree (priv);
return 0;
}
@@ -1111,7 +1113,7 @@ c4_add_dev (hdw_info_t * hi, int brdno, unsigned long f0, unsigned long f1,
ndev = alloc_netdev(sizeof(ci_t), SBE_IFACETMPL, c4_setup);
if (!ndev)
{
- printk (KERN_WARNING "%s: no memory for struct net_device !\n", hi->devname);
+ pr_warning("%s: no memory for struct net_device !\n", hi->devname);
error_flag = ENOMEM;
return 0;
}
@@ -1177,8 +1179,7 @@ c4_add_dev (hdw_info_t * hi, int brdno, unsigned long f0, unsigned long f1,
#endif
ndev->name, ndev))
{
- printk (KERN_WARNING "%s: MUSYCC could not get irq: %d\n",
- ndev->name, irq0);
+ pr_warning("%s: MUSYCC could not get irq: %d\n", ndev->name, irq0);
unregister_netdev (ndev);
OS_kfree (netdev_priv(ndev));
OS_kfree (ndev);
@@ -1188,8 +1189,7 @@ c4_add_dev (hdw_info_t * hi, int brdno, unsigned long f0, unsigned long f1,
#ifdef CONFIG_SBE_PMCC4_NCOMM
if (request_irq (irq1, &c4_ebus_interrupt, IRQF_SHARED, ndev->name, ndev))
{
- printk (KERN_WARNING "%s: EBUS could not get irq: %d\n",
- hi->devname, irq1);
+ pr_warning("%s: EBUS could not get irq: %d\n", hi->devname, irq1);
unregister_netdev (ndev);
free_irq (irq0, ndev);
OS_kfree (netdev_priv(ndev));
@@ -1263,33 +1263,33 @@ c4_mod_init (void)
{
int rtn;
- printk (KERN_WARNING "%s: %s\n", THIS_MODULE->name, pmcc4_OSSI_release);
+ pr_warning("%s\n", pmcc4_OSSI_release);
if ((rtn = c4hw_attach_all ()))
return -rtn; /* installation failure - see system log */
/* housekeeping notifications */
if (log_level != log_level_default)
- printk (KERN_INFO "%s NOTE: driver parameter <log_level> changed from default %d to %d.\n",
- THIS_MODULE->name, log_level_default, log_level);
+ pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n",
+ log_level_default, log_level);
if (max_mru != max_mru_default)
- printk (KERN_INFO "%s NOTE: driver parameter <max_mru> changed from default %d to %d.\n",
- THIS_MODULE->name, max_mru_default, max_mru);
+ pr_info("NOTE: driver parameter <max_mru> changed from default %d to %d.\n",
+ max_mru_default, max_mru);
if (max_mtu != max_mtu_default)
- printk (KERN_INFO "%s NOTE: driver parameter <max_mtu> changed from default %d to %d.\n",
- THIS_MODULE->name, max_mtu_default, max_mtu);
+ pr_info("NOTE: driver parameter <max_mtu> changed from default %d to %d.\n",
+ max_mtu_default, max_mtu);
if (max_rxdesc_used != max_rxdesc_default)
{
if (max_rxdesc_used > 2000)
max_rxdesc_used = 2000; /* out-of-bounds reset */
- printk (KERN_INFO "%s NOTE: driver parameter <max_rxdesc_used> changed from default %d to %d.\n",
- THIS_MODULE->name, max_rxdesc_default, max_rxdesc_used);
+ pr_info("NOTE: driver parameter <max_rxdesc_used> changed from default %d to %d.\n",
+ max_rxdesc_default, max_rxdesc_used);
}
if (max_txdesc_used != max_txdesc_default)
{
if (max_txdesc_used > 1000)
max_txdesc_used = 1000; /* out-of-bounds reset */
- printk (KERN_INFO "%s NOTE: driver parameter <max_txdesc_used> changed from default %d to %d.\n",
- THIS_MODULE->name, max_txdesc_default, max_txdesc_used);
+ pr_info("NOTE: driver parameter <max_txdesc_used> changed from default %d to %d.\n",
+ max_txdesc_default, max_txdesc_used);
}
return 0; /* installation success */
}
@@ -1331,7 +1331,7 @@ c4_mod_remove (void)
cleanup_devs ();
c4_cleanup ();
cleanup_ioremap ();
- printk (KERN_INFO "SBE %s - driver removed.\n", THIS_MODULE->name);
+ pr_info("SBE - driver removed.\n");
}
module_init (c4_mod_init);
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c
index 650c9c0..7a6d92a 100644
--- a/drivers/staging/cxt1e1/musycc.c
+++ b/drivers/staging/cxt1e1/musycc.c
@@ -71,6 +71,7 @@ unsigned int max_bh = 0;
char SBEid_pmcc4_musyccc[] =
"@(#)musycc.c - $Revision: 2.1 $ (c) Copyright 2004-2006 SBE, Inc.";
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/types.h>
#include "pmcc4_sysdep.h"
@@ -681,8 +682,8 @@ rewrite:
}
if (rcnt > MUSYCC_SR_RETRY_CNT)
{
- printk (KERN_WARNING "%s: failed service request (#%d)= %x, group %d.\n",
- pi->up->devname, MUSYCC_SR_RETRY_CNT, req, pi->portnum);
+ pr_warning("%s: failed service request (#%d)= %x, group %d.\n",
+ pi->up->devname, MUSYCC_SR_RETRY_CNT, req, pi->portnum);
SD_SEM_GIVE (&pi->sr_sem_busy); /* allow any next request */
return;
}
@@ -959,14 +960,14 @@ musycc_init (ci_t * ci)
if (max_mru > 0xffe)
{
- printk (KERN_WARNING "%s: Maximum allowed MRU exceeded, resetting %d to %d.\n",
- THIS_MODULE->name, max_mru, 0xffe);
+ pr_warning("Maximum allowed MRU exceeded, resetting %d to %d.\n",
+ max_mru, 0xffe);
max_mru = 0xffe;
}
if (max_mtu > 0xffe)
{
- printk (KERN_WARNING "%s: Maximum allowed MTU exceeded, resetting %d to %d.\n",
- THIS_MODULE->name, max_mtu, 0xffe);
+ pr_warning("Maximum allowed MTU exceeded, resetting %d to %d.\n",
+ max_mtu, 0xffe);
max_mtu = 0xffe;
}
#ifdef SBE_WAN256T3_ENABLE
diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c
index ada80d0..1617333 100644
--- a/drivers/staging/cxt1e1/pmcc4_drv.c
+++ b/drivers/staging/cxt1e1/pmcc4_drv.c
@@ -83,6 +83,7 @@
char OSSIid_pmcc4_drvc[] =
"@(#)pmcc4_drv.c - $Revision: 3.1 $ (c) Copyright 2002-2007 One Stop Systems, Inc.";
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#if defined (__FreeBSD__) || defined (__NetBSD__)
#include <sys/param.h>
@@ -207,8 +208,8 @@ c4_new (void *hi)
ci_t *ci;
#ifdef SBE_MAP_DEBUG
- printk (KERN_WARNING "%s: c4_new() entered, ci needs %u.\n",
- THIS_MODULE->name, (unsigned int) sizeof (ci_t));
+ pr_warning("c4_new() entered, ci needs %u.\n",
+ (unsigned int) sizeof (ci_t));
#endif
ci = (ci_t *) OS_kmalloc (sizeof (ci_t));
@@ -220,8 +221,8 @@ c4_new (void *hi)
c4_list = ci;
ci->brdno = ci->next ? ci->next->brdno + 1 : 0;
} else
- printk (KERN_WARNING "%s: failed CI malloc, size %u.\n",
- THIS_MODULE->name, (unsigned int) sizeof (ci_t));
+ pr_warning("failed CI malloc, size %u.\n",
+ (unsigned int) sizeof (ci_t));
if (CI == 0)
CI = ci; /* DEBUG, only board 0 usage */
@@ -805,7 +806,8 @@ c4_init (ci_t * ci, u_char *func0, u_char *func1)
break;
default:
ci->max_port = 0;
- printk (KERN_WARNING "%s: illegal port configuration (%x)\n", ci->devname, pmsk);
+ pr_warning("%s: illegal port configuration (%x)\n",
+ ci->devname, pmsk);
return SBE_DRVR_FAIL;
}
#ifdef SBE_MAP_DEBUG
@@ -847,8 +849,8 @@ c4_init (ci_t * ci, u_char *func0, u_char *func1)
ch->p.mode_56k = 0; /* default is 64kbps mode */
} else
{
- printk (KERN_WARNING "%s: failed mch_t malloc, port %d channel %d size %u.\n",
- THIS_MODULE->name, portnum, j, (unsigned int) sizeof (mch_t));
+ pr_warning("failed mch_t malloc, port %d channel %d size %u.\n",
+ portnum, j, (unsigned int) sizeof (mch_t));
break;
}
}
diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h
index 2ab1eb1..44229a9 100644
--- a/drivers/staging/cxt1e1/sbecom_inline_linux.h
+++ b/drivers/staging/cxt1e1/sbecom_inline_linux.h
@@ -164,7 +164,7 @@ OS_mem_token_alloc (size_t size)
skb = dev_alloc_skb (size);
if (!skb)
{
- //printk (KERN_WARNING "no mem in OS_mem_token_alloc !");
+ //pr_warning("no mem in OS_mem_token_alloc !\n");
return 0;
}
return skb;
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index 61ca639..92f6f5c 100644
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -11,6 +11,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/types.h>
#include <linux/module.h>
#include <linux/errno.h>
@@ -318,16 +320,14 @@ sbecom_proc_brd_init (ci_t * ci)
ci->dir_dev = proc_mkdir(dir, NULL);
if (!ci->dir_dev)
{
- printk (KERN_ERR "%s: Unable to create directory /proc/driver/%s\n",
- THIS_MODULE->name, ci->devname);
+ pr_err("Unable to create directory /proc/driver/%s\n", ci->devname);
goto fail;
}
e = create_proc_read_entry ("info", S_IFREG | S_IRUGO,
ci->dir_dev, sbecom_proc_get_sbe_info, ci);
if (!e)
{
- printk (KERN_ERR "%s: Unable to create entry /proc/driver/%s/info\n",
- THIS_MODULE->name, ci->devname);
+ pr_err("Unable to create entry /proc/driver/%s/info\n", ci->devname);
goto fail;
}
return 0;
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH -next] staging: fix cxt1e1 module names
2010-05-03 18:02 ` Joe Perches
@ 2010-05-03 18:06 ` Randy Dunlap
2010-05-03 19:33 ` [PATCH -next] staging/cxt1e1: Convert bare printks to pr_<level> Joe Perches
0 siblings, 1 reply; 10+ messages in thread
From: Randy Dunlap @ 2010-05-03 18:06 UTC (permalink / raw)
To: Joe Perches
Cc: Stephen Rothwell, gregkh, devel, linux-next, LKML, support,
support
On Mon, 03 May 2010 11:02:44 -0700 Joe Perches wrote:
> On Mon, 2010-05-03 at 10:09 -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Lots of cxt1e1 source code uses THIS_MODULE->name, which won't build
> > when CONFIG_MODULES is not enabled, so use KBUILD_MODNAME instead.
>
> Perhaps a conversion to pr_<level> is better?
Sure, fine with me. Thanks.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] staging/cxt1e1: Convert bare printks to pr_<level>
2010-05-03 18:06 ` Randy Dunlap
@ 2010-05-03 19:33 ` Joe Perches
2010-05-05 12:21 ` Peter Hüwe
0 siblings, 1 reply; 10+ messages in thread
From: Joe Perches @ 2010-05-03 19:33 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, gregkh, devel, linux-next, LKML, support,
support
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>
---
drivers/staging/cxt1e1/comet.c | 8 +-
drivers/staging/cxt1e1/functions.c | 4 +-
drivers/staging/cxt1e1/hwprobe.c | 22 ++--
drivers/staging/cxt1e1/linux.c | 28 ++--
drivers/staging/cxt1e1/musycc.c | 128 +++++++++---------
drivers/staging/cxt1e1/pmc93x6_eeprom.c | 12 +-
drivers/staging/cxt1e1/pmcc4_drv.c | 183 +++++++++++++-------------
drivers/staging/cxt1e1/sbecom_inline_linux.h | 4 +-
drivers/staging/cxt1e1/sbeproc.c | 6 +-
9 files changed, 204 insertions(+), 191 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 */
}
diff --git a/drivers/staging/cxt1e1/functions.c b/drivers/staging/cxt1e1/functions.c
index 738129d..86b4980 100644
--- a/drivers/staging/cxt1e1/functions.c
+++ b/drivers/staging/cxt1e1/functions.c
@@ -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
diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
index 571fa1f..8d4e8d2 100644
--- a/drivers/staging/cxt1e1/hwprobe.c
+++ b/drivers/staging/cxt1e1/hwprobe.c
@@ -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;
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index ce2942c..134e756 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -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;
}
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c
index 7a6d92a..d3f5a5b 100644
--- a/drivers/staging/cxt1e1/musycc.c
+++ b/drivers/staging/cxt1e1/musycc.c
@@ -137,7 +137,7 @@ musycc_dump_rxbuffer_ring (mch_t * ch, int lockit)
}
if (ch->rxd_num == 0)
{
- printk (" ZERO receive buffers allocated for this channel.");
+ pr_info(" ZERO receive buffers allocated for this channel.");
} else
{
FLUSH_MEM_READ ();
@@ -146,7 +146,7 @@ musycc_dump_rxbuffer_ring (mch_t * ch, int lockit)
{
status = le32_to_cpu (m->status);
{
- printk ("%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
+ pr_info("%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
(m == &ch->mdr[ch->rxix_irq_srv]) ? 'F' : ' ',
(unsigned long) m, n,
status,
@@ -170,13 +170,13 @@ musycc_dump_rxbuffer_ring (mch_t * ch, int lockit)
{
dp = (u_int32_t *) OS_phystov ((void *) (le32_to_cpu (m->data)));
if (len >= 0x10)
- printk (" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
+ pr_info(" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
*dp, *(dp + 1), *(dp + 2), *(dp + 3));
else if (len >= 0x08)
- printk (" %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
+ pr_info(" %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
*dp, *(dp + 1));
else
- printk (" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
+ pr_info(" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
}
}
#endif
@@ -184,7 +184,7 @@ musycc_dump_rxbuffer_ring (mch_t * ch, int lockit)
m = m->snext;
}
} /* -for- */
- printk ("\n");
+ pr_info("\n");
if (lockit)
{
@@ -209,7 +209,7 @@ musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
}
if (ch->txd_num == 0)
{
- printk (" ZERO transmit buffers allocated for this channel.");
+ pr_info(" ZERO transmit buffers allocated for this channel.");
} else
{
FLUSH_MEM_READ ();
@@ -218,7 +218,7 @@ musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
{
status = le32_to_cpu (m->status);
{
- printk ("%c%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
+ pr_info("%c%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
(m == ch->txd_usr_add) ? 'F' : ' ',
(m == ch->txd_irq_srv) ? 'L' : ' ',
(unsigned long) m, n,
@@ -238,13 +238,13 @@ musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
{
dp = (u_int32_t *) OS_phystov ((void *) (le32_to_cpu (m->data)));
if (len >= 0x10)
- printk (" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
+ pr_info(" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
*dp, *(dp + 1), *(dp + 2), *(dp + 3));
else if (len >= 0x08)
- printk (" %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
+ pr_info(" %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
*dp, *(dp + 1));
else
- printk (" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
+ pr_info(" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
}
}
#endif
@@ -252,7 +252,7 @@ musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
m = m->snext;
}
} /* -for- */
- printk ("\n");
+ pr_info("\n");
if (lockit)
{
@@ -281,7 +281,7 @@ musycc_dump_ring (ci_t * ci, unsigned int chan)
int bh;
bh = atomic_read (&ci->bh_pending);
- printk (">> bh_pend %d [%d] ihead %d itail %d [%d] th_cnt %d bh_cnt %d wdcnt %d note %d\n",
+ pr_info(">> bh_pend %d [%d] ihead %d itail %d [%d] th_cnt %d bh_cnt %d wdcnt %d note %d\n",
bh, max_bh, ci->iqp_headx, ci->iqp_tailx, max_intcnt,
ci->intlog.drvr_intr_thcount,
ci->intlog.drvr_intr_bhcount,
@@ -292,20 +292,20 @@ musycc_dump_ring (ci_t * ci, unsigned int chan)
if (!(ch = sd_find_chan (dummy, chan)))
{
- printk (">> musycc_dump_ring: channel %d not up.\n", chan);
+ pr_info(">> musycc_dump_ring: channel %d not up.\n", chan);
return ENOENT;
}
- printk (">> CI %p CHANNEL %3d @ %p: state %x status/p %x/%x\n", ci, chan, ch, ch->state,
+ pr_info(">> CI %p CHANNEL %3d @ %p: state %x status/p %x/%x\n", ci, chan, ch, ch->state,
ch->status, ch->p.status);
- printk ("--------------------------------\nTX Buffer Ring - Channel %d, txd_num %d. (bd/ch pend %d %d), TXD required %d, txpkt %lu\n",
+ pr_info("--------------------------------\nTX Buffer Ring - Channel %d, txd_num %d. (bd/ch pend %d %d), TXD required %d, txpkt %lu\n",
chan, ch->txd_num,
(u_int32_t) atomic_read (&ci->tx_pending), (u_int32_t) atomic_read (&ch->tx_pending), ch->txd_required, ch->s.tx_packets);
- printk ("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
+ pr_info("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
ch->user, ch->txd_irq_srv, ch->txd_usr_add,
sd_queue_stopped (ch->user),
ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
musycc_dump_txbuffer_ring (ch, 1);
- printk ("RX Buffer Ring - Channel %d, rxd_num %d. IRQ_SRV[%d] 0x%p, start_rx %x rxpkt %lu\n",
+ pr_info("RX Buffer Ring - Channel %d, rxd_num %d. IRQ_SRV[%d] 0x%p, start_rx %x rxpkt %lu\n",
chan, ch->rxd_num, ch->rxix_irq_srv,
&ch->mdr[ch->rxix_irq_srv], ch->ch_start_rx, ch->s.rx_packets);
musycc_dump_rxbuffer_ring (ch, 1);
@@ -400,7 +400,7 @@ musycc_update_tx_thp (mch_t * ch)
spin_unlock_irqrestore (&ch->ch_txlock, flags);
#ifdef RLD_TRANS_DEBUG
- printk ("++ musycc_update_tx_thp[%d]: setting thp = %p, sts %x\n", ch->channum, md, md->status);
+ pr_info("++ musycc_update_tx_thp[%d]: setting thp = %p, sts %x\n", ch->channum, md, md->status);
#endif
}
@@ -429,7 +429,7 @@ musycc_wq_chan_restart (void *arg) /* channel private structure */
pi = ch->up;
#ifdef RLD_TRANS_DEBUG
- printk ("wq_chan_restart[%d]: start_RT[%d/%d] status %x\n",
+ pr_info("wq_chan_restart[%d]: start_RT[%d/%d] status %x\n",
ch->channum, ch->ch_start_rx, ch->ch_start_tx, ch->status);
#endif
@@ -451,12 +451,12 @@ musycc_wq_chan_restart (void *arg) /* channel private structure */
hereb4--;
#ifdef RLD_TRANS_DEBUG
md = &ch->mdr[ch->rxix_irq_srv];
- printk ("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
+ pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
ch->channum, ch->rxix_irq_srv, md, le32_to_cpu (md->status),
ch->s.rx_packets);
#elif defined(RLD_RXACT_DEBUG)
md = &ch->mdr[ch->rxix_irq_srv];
- printk ("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
+ pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
ch->channum, ch->rxix_irq_srv, md, le32_to_cpu (md->status),
ch->s.rx_packets);
musycc_dump_rxbuffer_ring (ch, 1); /* RLD DEBUG */
@@ -482,7 +482,7 @@ musycc_wq_chan_restart (void *arg) /* channel private structure */
if (!md)
{
#ifdef RLD_TRANS_DEBUG
- printk ("-- musycc_wq_chan_restart[%d]: WARNING, starting NULL md\n", ch->channum);
+ pr_info("-- musycc_wq_chan_restart[%d]: WARNING, starting NULL md\n", ch->channum);
#endif
#if 0
spin_unlock_irqrestore (&ch->ch_txlock, flags);
@@ -494,7 +494,7 @@ musycc_wq_chan_restart (void *arg) /* channel private structure */
spin_unlock_irqrestore (&ch->ch_txlock, flags); /* allow interrupts for service request */
#endif
#ifdef RLD_TRANS_DEBUG
- printk ("++ musycc_wq_chan_restart() CHAN TX ACTIVATE: chan %d txd_irq_srv %p = sts %x, txpkt %lu\n",
+ pr_info("++ musycc_wq_chan_restart() CHAN TX ACTIVATE: chan %d txd_irq_srv %p = sts %x, txpkt %lu\n",
ch->channum, ch->txd_irq_srv, ch->txd_irq_srv->status, ch->s.tx_packets);
#endif
musycc_serv_req (pi, SR_CHANNEL_ACTIVATE | SR_TX_DIRECTION | ch->gchan);
@@ -503,7 +503,7 @@ musycc_wq_chan_restart (void *arg) /* channel private structure */
else
{
/* retain request to start until retried and we have data to xmit */
- printk ("-- musycc_wq_chan_restart[%d]: DELAYED due to md %p sts %x data %x, start_tx %x\n",
+ pr_info("-- musycc_wq_chan_restart[%d]: DELAYED due to md %p sts %x data %x, start_tx %x\n",
ch->channum, md,
le32_to_cpu (md->status),
le32_to_cpu (md->data), ch->ch_start_tx);
@@ -527,14 +527,14 @@ void
musycc_chan_restart (mch_t * ch)
{
#ifdef RLD_RESTART_DEBUG
- printk ("++ musycc_chan_restart[%d]: txd_irq_srv @ %p = sts %x\n",
+ pr_info("++ musycc_chan_restart[%d]: txd_irq_srv @ %p = sts %x\n",
ch->channum, ch->txd_irq_srv, ch->txd_irq_srv->status);
#endif
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41)
/* 2.6 - find next unprocessed message, then set TX thp to it */
#ifdef RLD_RESTART_DEBUG
- printk (">> musycc_chan_restart: scheduling Chan %x workQ @ %p\n", ch->channum, &ch->ch_work);
+ pr_info(">> musycc_chan_restart: scheduling Chan %x workQ @ %p\n", ch->channum, &ch->ch_work);
#endif
c4_wk_chan_restart (ch); /* work queue mechanism fires off: Ref:
* musycc_wq_chan_restart () */
@@ -544,7 +544,7 @@ musycc_chan_restart (mch_t * ch)
/* 2.4 - find next unprocessed message, then set TX thp to it */
#ifdef RLD_RESTART_DEBUG
- printk (">> musycc_chan_restart: scheduling Chan %x start_tx %x\n", ch->channum, ch->ch_start_tx);
+ pr_info(">> musycc_chan_restart: scheduling Chan %x start_tx %x\n", ch->channum, ch->ch_start_tx);
#endif
/* restart transmission from background loop */
ch->up->up->wd_notify = WD_NOTIFY_1TX;
@@ -620,7 +620,7 @@ musycc_serv_req (mpi_t * pi, u_int32_t req)
if (pi->sr_last == req)
{
#ifdef RLD_TRANS_DEBUG
- printk (">> same SR, Port %d Req %x\n", pi->portnum, req);
+ pr_info(">> same SR, Port %d Req %x\n", pi->portnum, req);
#endif
/*
@@ -636,7 +636,7 @@ musycc_serv_req (mpi_t * pi, u_int32_t req)
(r == (SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION)))
{
#ifdef RLD_TRANS_DEBUG
- printk (">> same CHAN ACT SR, Port %d Req %x => issue SR_NOOP CMD\n", pi->portnum, req);
+ pr_info(">> same CHAN ACT SR, Port %d Req %x => issue SR_NOOP CMD\n", pi->portnum, req);
#endif
SD_SEM_GIVE (&pi->sr_sem_busy); /* allow this next request */
musycc_serv_req (pi, SR_NOOP);
@@ -646,7 +646,7 @@ musycc_serv_req (mpi_t * pi, u_int32_t req)
{
/* no need to issue back-to-back SR_NOOP commands at this time */
#ifdef RLD_TRANS_DEBUG
- printk (">> same Port SR_NOOP skipped, Port %d\n", pi->portnum);
+ pr_info(">> same Port SR_NOOP skipped, Port %d\n", pi->portnum);
#endif
SD_SEM_GIVE (&pi->sr_sem_busy); /* allow this next request */
return;
@@ -673,7 +673,7 @@ rewrite:
if ((r != req) && (req != SR_CHIP_RESET) && (++rcnt <= MUSYCC_SR_RETRY_CNT))
{
if (log_level >= LOG_MONITOR)
- printk ("%s: %d - reissue srv req/last %x/%x (hdw reads %x), Chan %d.\n",
+ pr_info("%s: %d - reissue srv req/last %x/%x (hdw reads %x), Chan %d.\n",
pi->up->devname, rcnt, req, pi->sr_last, r,
(pi->portnum * MUSYCC_NCHANS) + (req & 0x1f));
OS_uwait_dummy (); /* this delay helps reduce reissue counts
@@ -997,7 +997,8 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
if (ch == 0 || ch->state != UP)
{
if (log_level >= LOG_ERROR)
- printk ("%s: intr: xmit EOM on uninitialized channel %d\n", pi->up->devname, gchan);
+ pr_info("%s: intr: xmit EOM on uninitialized channel %d\n",
+ pi->up->devname, gchan);
}
if (ch == 0 || ch->mdt == 0)
return; /* note: mdt==0 implies a malloc()
@@ -1048,9 +1049,10 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
{
if (log_level >= LOG_MONITOR)
{
- printk ("%s: Port %d Chan %2d - unexpected TX msg ownership intr (md %p sts %x)\n",
- pi->up->devname, pi->portnum, ch->channum, md, status);
- printk ("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
+ pr_info("%s: Port %d Chan %2d - unexpected TX msg ownership intr (md %p sts %x)\n",
+ pi->up->devname, pi->portnum, ch->channum,
+ md, status);
+ pr_info("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
ch->user, ch->txd_irq_srv, ch->txd_usr_add,
sd_queue_stopped (ch->user),
ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
@@ -1060,7 +1062,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
} else
{
if (log_level >= LOG_MONITOR)
- printk ("%s: Port %d Chan %2d - recovered TX msg ownership [%d] (md %p sts %x)\n",
+ pr_info("%s: Port %d Chan %2d - recovered TX msg ownership [%d] (md %p sts %x)\n",
pi->up->devname, pi->portnum, ch->channum, readCount, md, status);
}
}
@@ -1098,7 +1100,8 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
md->status = 0;
#ifdef RLD_TXFULL_DEBUG
if (log_level >= LOG_MONITOR2)
- printk ("~~ tx_eom: tx_full %x txd_free %d -> %d\n", ch->tx_full, ch->txd_free, ch->txd_free + 1);
+ pr_info("~~ tx_eom: tx_full %x txd_free %d -> %d\n",
+ ch->tx_full, ch->txd_free, ch->txd_free + 1);
#endif
++ch->txd_free;
FLUSH_MEM_WRITE ();
@@ -1106,7 +1109,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
if ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && (status & EOBIRQ_ENABLE))
{
if (log_level >= LOG_MONITOR)
- printk ("%s: Mode (%x) incorrect EOB status (%x)\n",
+ pr_info("%s: Mode (%x) incorrect EOB status (%x)\n",
pi->up->devname, ch->p.chan_mode, status);
if ((status & EOMIRQ_ENABLE) == 0)
break;
@@ -1137,7 +1140,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
#ifdef RLD_TXFULL_DEBUG
if (log_level >= LOG_MONITOR2)
- printk ("tx_eom[%d]: enable xmit tx_full no more, txd_free %d txd_num/2 %d\n",
+ pr_info("tx_eom[%d]: enable xmit tx_full no more, txd_free %d txd_num/2 %d\n",
ch->channum,
ch->txd_free, ch->txd_num / 2);
#endif
@@ -1151,7 +1154,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
else if (ch->tx_full)
{
if (log_level >= LOG_MONITOR2)
- printk ("tx_eom[%d]: bypass TX enable though room available? (txd_free %d txd_num/2 %d)\n",
+ pr_info("tx_eom[%d]: bypass TX enable though room available? (txd_free %d txd_num/2 %d)\n",
ch->channum,
ch->txd_free, ch->txd_num / 2);
}
@@ -1181,7 +1184,8 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan)
if (ch == 0 || ch->state != UP)
{
if (log_level > LOG_ERROR)
- printk ("%s: intr: receive EOM on uninitialized channel %d\n", pi->up->devname, gchan);
+ pr_info("%s: intr: receive EOM on uninitialized channel %d\n",
+ pi->up->devname, gchan);
return;
}
if (ch->mdr == 0)
@@ -1312,7 +1316,7 @@ musycc_intr_th_handler (void *devp)
{
if (log_level >= LOG_MONITOR)
{
- printk ("%s: note - updated ISD from %08x to %08x\n",
+ pr_info("%s: note - updated ISD from %08x to %08x\n",
ci->devname, status,
(status & (~INTRPTS_NEXTINT_M)) | ci->intlog.this_status_new);
}
@@ -1366,7 +1370,7 @@ musycc_intr_th_handler (void *devp)
*/
#if 0
/* chained interrupt = not ours */
- printk (">> %s: intCnt NULL, sts %x, possibly a chained interrupt!\n",
+ pr_info(">> %s: intCnt NULL, sts %x, possibly a chained interrupt!\n",
ci->devname, status);
#endif
return IRQ_NONE;
@@ -1380,10 +1384,10 @@ musycc_intr_th_handler (void *devp)
if ((log_level >= LOG_WARN) && (status & INTRPTS_INTFULL_M))
{
- printk ("%s: Interrupt queue full condition occurred\n", ci->devname);
+ pr_info("%s: Interrupt queue full condition occurred\n", ci->devname);
}
if (log_level >= LOG_DEBUG)
- printk ("%s: interrupts pending, isd @ 0x%p: %x curr %d cnt %d NEXT %d\n",
+ pr_info("%s: interrupts pending, isd @ 0x%p: %x curr %d cnt %d NEXT %d\n",
ci->devname, &ci->reg->isd,
status, nextInt, intCnt, (intCnt + nextInt) & (INT_QUEUE_SIZE - 1));
@@ -1490,7 +1494,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
* Fix checking */
{
if (log_level >= LOG_WARN)
- printk ("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n",
+ pr_info("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n",
ci->devname, &ci->iqd_p[headx], headx);
/*
@@ -1527,9 +1531,9 @@ musycc_intr_bh_tasklet (ci_t * ci)
if (log_level >= LOG_DEBUG)
{
if (err != 0)
- printk (" %08x -> err: %2d,", currInt, err);
+ pr_info(" %08x -> err: %2d,", currInt, err);
- printk ("+ interrupt event: %d, grp: %d, chan: %2d, side: %cX\n",
+ pr_info("+ interrupt event: %d, grp: %d, chan: %2d, side: %cX\n",
event, group, gchan, tx ? 'T' : 'R');
}
pi = &ci->port[group]; /* notice that here we assume 1-1 group -
@@ -1543,7 +1547,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
volatile u_int32_t r;
r = pci_read_32 ((u_int32_t *) &pi->reg->srd);
- printk ("- SACK cmd: %08x (hdw= %08x)\n", pi->sr_last, r);
+ pr_info("- SACK cmd: %08x (hdw= %08x)\n", pi->sr_last, r);
}
SD_SEM_GIVE (&pi->sr_sem_wait); /* wake up waiting process */
break;
@@ -1576,7 +1580,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
break;
default:
if (log_level >= LOG_WARN)
- printk ("%s: unexpected interrupt event: %d, iqd[%d]: %08x, port: %d\n", ci->devname,
+ pr_info("%s: unexpected interrupt event: %d, iqd[%d]: %08x, port: %d\n", ci->devname,
event, headx, currInt, group);
break;
} /* switch on event */
@@ -1619,13 +1623,13 @@ musycc_intr_bh_tasklet (ci_t * ci)
if (log_level >= LOG_MONITOR)
#endif
{
- printk ("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n",
+ pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n",
ci->devname, ch->channum, ch->p.chan_mode, sd_queue_stopped (ch->user), ch->txd_free);
#ifdef RLD_DEBUG
if (ch->p.chan_mode == 2) /* problem = ONR on HDLC
* mode */
{
- printk ("++ Failed Last %x Next %x QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
+ pr_info("++ Failed Last %x Next %x QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
(u_int32_t) ch->txd_irq_srv, (u_int32_t) ch->txd_usr_add,
sd_queue_stopped (ch->user),
ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
@@ -1648,7 +1652,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
if (log_level >= LOG_WARN)
{
- printk ("%s: RX buffer overflow [ONR] on channel %d, mode %x\n",
+ pr_info("%s: RX buffer overflow [ONR] on channel %d, mode %x\n",
ci->devname, ch->channum, ch->p.chan_mode);
//musycc_dump_rxbuffer_ring (ch, 0); /* RLD DEBUG */
}
@@ -1665,7 +1669,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
* this BUFF error requires Transmit channel reactivation.
*/
if (log_level >= LOG_MONITOR)
- printk ("%s: TX buffer underrun [BUFF] on channel %d, mode %x\n",
+ pr_info("%s: TX buffer underrun [BUFF] on channel %d, mode %x\n",
ci->devname, ch->channum, ch->p.chan_mode);
} else /* RX buffer overrun */
{
@@ -1678,7 +1682,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
* not required, but data has been lost.
*/
if (log_level >= LOG_WARN)
- printk ("%s: RX buffer overrun [BUFF] on channel %d, mode %x\n",
+ pr_info("%s: RX buffer overrun [BUFF] on channel %d, mode %x\n",
ci->devname, ch->channum, ch->p.chan_mode);
/*
* Per MUSYCC manual, Section 6.4.9.4 [Receive Errors],
@@ -1701,7 +1705,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
/* Check for interrupt lost condition */
if ((currInt & INTRPT_ILOST_M) && (log_level >= LOG_ERROR))
{
- printk ("%s: Interrupt queue overflow - ILOST asserted\n",
+ pr_info("%s: Interrupt queue overflow - ILOST asserted\n",
ci->devname);
}
ci->iqp_headx = (headx + 1) & (INT_QUEUE_SIZE - 1); /* insure wrapness */
@@ -1713,7 +1717,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
int bh;
bh = atomic_read (&CI->bh_pending);
- printk ("_bh_: late arrivals, head %d != tail %d, pending %d\n",
+ pr_info("_bh_: late arrivals, head %d != tail %d, pending %d\n",
ci->iqp_headx, ci->iqp_tailx, bh);
}
#if defined(SBE_ISR_IMMEDIATE)
@@ -1867,7 +1871,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
if (log_level >= LOG_MONITOR2)
#endif
{
- printk ("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n",
+ pr_info("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n",
channum, ch->state, ch->ch_start_tx, ch->tx_full,
ch->txd_free, ch->txd_required, sd_queue_stopped (ch->user));
}
@@ -1888,7 +1892,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
if (txd_need_cnt == 0)
{
if (log_level >= LOG_MONITOR2)
- printk ("%s channel %d: no TX data in User buffer\n", ci->devname, channum);
+ pr_info("%s channel %d: no TX data in User buffer\n", ci->devname, channum);
OS_mem_token_free (mem_token);
return 0; /* no data to send */
}
@@ -1900,7 +1904,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
{
if (log_level >= LOG_DEBUG)
{
- printk ("start_xmit: discarding buffer, insufficient descriptor cnt %d, need %d.\n",
+ pr_info("start_xmit: discarding buffer, insufficient descriptor cnt %d, need %d.\n",
ch->txd_num, txd_need_cnt + 1);
}
ch->s.tx_dropped++;
@@ -1917,7 +1921,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
{
if (log_level >= LOG_MONITOR2)
{
- printk ("start_xmit[%d]: EBUSY - need more descriptors, have %d of %d need %d\n",
+ pr_info("start_xmit[%d]: EBUSY - need more descriptors, have %d of %d need %d\n",
channum, ch->txd_free, ch->txd_num, txd_need_cnt);
}
ch->tx_full = 1;
diff --git a/drivers/staging/cxt1e1/pmc93x6_eeprom.c b/drivers/staging/cxt1e1/pmc93x6_eeprom.c
index 02c829b..1c8dfb8 100644
--- a/drivers/staging/cxt1e1/pmc93x6_eeprom.c
+++ b/drivers/staging/cxt1e1/pmc93x6_eeprom.c
@@ -21,6 +21,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/types.h>
#include "pmcc4_sysdep.h"
#include "sbecom_inline_linux.h"
@@ -448,7 +450,7 @@ pmcCalcCrc_T01 (void *bufp)
(u_int32_t *) &crc);
#ifdef EEPROM_TYPE_DEBUG
- printk ("sbeCrc: crc 1 calculated as %08x\n", crc); /* RLD DEBUG */
+ pr_info("sbeCrc: crc 1 calculated as %08x\n", crc); /* RLD DEBUG */
#endif
return ~crc;
}
@@ -474,7 +476,7 @@ pmcCalcCrc_T02 (void *bufp)
(u_int32_t *) &crc);
#ifdef EEPROM_TYPE_DEBUG
- printk ("sbeCrc: crc 2 calculated as %08x\n", crc); /* RLD DEBUG */
+ pr_info("sbeCrc: crc 2 calculated as %08x\n", crc); /* RLD DEBUG */
#endif
return crc;
}
@@ -520,7 +522,7 @@ pmc_init_seeprom (u_int32_t addr, u_int32_t serialNum)
#ifdef DEBUG
for (i = 0; i < sizeof (FLD_TYPE2); ++i)
- printk ("[%02X] = %02X\n", i, buffer.bytes[i] & 0xFF);
+ pr_info("[%02X] = %02X\n", i, buffer.bytes[i] & 0xFF);
#endif
/* Write structure to serial EEPROM */
@@ -538,7 +540,7 @@ pmc_verify_cksum (void *bufp)
/* Retrieve contents of CRC field */
crc1 = pmcGetBuffValue (&buf1->Crc32[0], sizeof (buf1->Crc32));
#ifdef EEPROM_TYPE_DEBUG
- printk ("EEPROM: chksum 1 reads as %08x\n", crc1); /* RLD DEBUG */
+ pr_info("EEPROM: chksum 1 reads as %08x\n", crc1); /* RLD DEBUG */
#endif
if ((buf1->type == PROM_FORMAT_TYPE1) &&
(pmcCalcCrc_T01 ((void *) buf1) == crc1))
@@ -546,7 +548,7 @@ pmc_verify_cksum (void *bufp)
crc2 = pmcGetBuffValue (&buf2->Crc32[0], sizeof (buf2->Crc32));
#ifdef EEPROM_TYPE_DEBUG
- printk ("EEPROM: chksum 2 reads as %08x\n", crc2); /* RLD DEBUG */
+ pr_info("EEPROM: chksum 2 reads as %08x\n", crc2); /* RLD DEBUG */
#endif
if ((buf2->type == PROM_FORMAT_TYPE2) &&
(pmcCalcCrc_T02 ((void *) buf2) == crc2))
diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c
index 1617333..333cf26 100644
--- a/drivers/staging/cxt1e1/pmcc4_drv.c
+++ b/drivers/staging/cxt1e1/pmcc4_drv.c
@@ -172,10 +172,10 @@ sbecom_set_loglevel (int d)
{
if (log_level != d)
{
- printk ("%s: log level changed from %d to %d\n", THIS_MODULE->name, log_level, d);
+ pr_info("log level changed from %d to %d\n", log_level, d);
log_level = d; /* set new */
} else
- printk ("%s: log level is %d\n", THIS_MODULE->name, log_level);
+ pr_info("log level is %d\n", log_level);
}
}
@@ -292,19 +292,18 @@ checkPorts (ci_t * ci)
if (!(((copyVal >> 3) & sbeLinkDown) ^ (value & sbeLinkDown)))
{
if (value & sbeLinkDown)
- printk (KERN_WARN "%s: Port %d momentarily recovered.\n",
- ci->devname, portnum);
+ pr_warning("%s: Port %d momentarily recovered.\n",
+ ci->devname, portnum);
else
- printk (KERN_WARN
- "%s: Warning: Port %d link was briefly down.\n",
- ci->devname, portnum);
+ pr_warning("%s: Warning: Port %d link was briefly down.\n",
+ ci->devname, portnum);
} else if (value & sbeLinkDown)
- printk (KERN_WARN "%s: Warning: Port %d link is down.\n",
- ci->devname, portnum);
+ pr_warning("%s: Warning: Port %d link is down.\n",
+ ci->devname, portnum);
else
{
- printk (KERN_WARN "%s: Port %d link has recovered.\n",
- ci->devname, portnum);
+ pr_warning("%s: Port %d link has recovered.\n",
+ ci->devname, portnum);
copyVal |= 0x20; /* record link transition to up */
}
copyVal |= 0x10; /* change (link) --> update LEDs */
@@ -331,35 +330,30 @@ checkPorts (ci_t * ci)
if (value & 0x1f)
{ /* if errors (crc or smf only) */
if (value & 0x10)
- printk (KERN_WARN
- "%s: E1 Port %d Codeword Sa4 change detected.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d Codeword Sa4 change detected.\n",
+ ci->devname, portnum);
if (value & 0x08)
- printk (KERN_WARN
- "%s: E1 Port %d Codeword Sa5 change detected.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d Codeword Sa5 change detected.\n",
+ ci->devname, portnum);
if (value & 0x04)
- printk (KERN_WARN
- "%s: E1 Port %d Codeword Sa6 change detected.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d Codeword Sa6 change detected.\n",
+ ci->devname, portnum);
if (value & 0x02)
- printk (KERN_WARN
- "%s: E1 Port %d Codeword Sa7 change detected.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d Codeword Sa7 change detected.\n",
+ ci->devname, portnum);
if (value & 0x01)
- printk (KERN_WARN
- "%s: E1 Port %d Codeword Sa8 change detected.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d Codeword Sa8 change detected.\n",
+ ci->devname, portnum);
}
value = pci_read_32 ((u_int32_t *) &comet->e1_frmr_mists); /* crc & smf */
if (value & 0x3)
{ /* if errors (crc or smf only) */
if (value & sbeE1CRC)
- printk (KERN_WARN "%s: E1 Port %d CRC-4 error(s) detected.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d CRC-4 error(s) detected.\n",
+ ci->devname, portnum);
if (value & sbeE1errSMF) /* error in sub-multiframe */
- printk (KERN_WARN "%s: E1 Port %d received errored SMF.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d received errored SMF.\n",
+ ci->devname, portnum);
}
value = pci_read_32 ((u_int32_t *) &comet->e1_frmr_masts) & 0xcc; /* alarms */
/*
@@ -383,43 +377,43 @@ checkPorts (ci_t * ci)
if ((copyVal & sbeRedAlm) && !(value & sbeRedAlm))
{
copyVal &= ~sbeRedAlm;
- printk (KERN_WARN "%s: E1 Port %d LOF alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d LOF alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeRedAlm) && (value & sbeRedAlm))
{
copyVal |= sbeRedAlm;
- printk (KERN_WARN "%s: E1 Warning: Port %d LOF alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Warning: Port %d LOF alarm.\n",
+ ci->devname, portnum);
} else if ((copyVal & sbeYelAlm) && !(value & sbeYelAlm))
{
copyVal &= ~sbeYelAlm;
- printk (KERN_WARN "%s: E1 Port %d RAI alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d RAI alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeYelAlm) && (value & sbeYelAlm))
{
copyVal |= sbeYelAlm;
- printk (KERN_WARN "%s: E1 Warning: Port %d RAI alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Warning: Port %d RAI alarm.\n",
+ ci->devname, portnum);
} else if ((copyVal & sbeE1RMAI) && !(value & sbeE1RMAI))
{
copyVal &= ~sbeE1RMAI;
- printk (KERN_WARN "%s: E1 Port %d RMAI alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d RMAI alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeE1RMAI) && (value & sbeE1RMAI))
{
copyVal |= sbeE1RMAI;
- printk (KERN_WARN "%s: E1 Warning: Port %d RMAI alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Warning: Port %d RMAI alarm.\n",
+ ci->devname, portnum);
} else if ((copyVal & sbeAISAlm) && !(value & sbeAISAlm))
{
copyVal &= ~sbeAISAlm;
- printk (KERN_WARN "%s: E1 Port %d AIS alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Port %d AIS alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeAISAlm) && (value & sbeAISAlm))
{
copyVal |= sbeAISAlm;
- printk (KERN_WARN "%s: E1 Warning: Port %d AIS alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: E1 Warning: Port %d AIS alarm.\n",
+ ci->devname, portnum);
}
}
/* end of E1 alarm code */
@@ -433,33 +427,33 @@ checkPorts (ci_t * ci)
if ((copyVal & sbeRedAlm) && !(value & sbeRedAlm))
{
copyVal &= ~sbeRedAlm;
- printk (KERN_WARN "%s: Port %d red alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: Port %d red alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeRedAlm) && (value & sbeRedAlm))
{
copyVal |= sbeRedAlm;
- printk (KERN_WARN "%s: Warning: Port %d red alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: Warning: Port %d red alarm.\n",
+ ci->devname, portnum);
} else if ((copyVal & sbeYelAlm) && !(value & sbeYelAlm))
{
copyVal &= ~sbeYelAlm;
- printk (KERN_WARN "%s: Port %d yellow (RAI) alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: Port %d yellow (RAI) alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeYelAlm) && (value & sbeYelAlm))
{
copyVal |= sbeYelAlm;
- printk (KERN_WARN "%s: Warning: Port %d yellow (RAI) alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: Warning: Port %d yellow (RAI) alarm.\n",
+ ci->devname, portnum);
} else if ((copyVal & sbeAISAlm) && !(value & sbeAISAlm))
{
copyVal &= ~sbeAISAlm;
- printk (KERN_WARN "%s: Port %d blue (AIS) alarm ended.\n",
- ci->devname, portnum);
+ pr_warning("%s: Port %d blue (AIS) alarm ended.\n",
+ ci->devname, portnum);
} else if (!(copyVal & sbeAISAlm) && (value & sbeAISAlm))
{
copyVal |= sbeAISAlm;
- printk (KERN_WARN "%s: Warning: Port %d blue (AIS) alarm.\n",
- ci->devname, portnum);
+ pr_warning("%s: Warning: Port %d blue (AIS) alarm.\n",
+ ci->devname, portnum);
}
}
} /* end T1 mode alarm checks */
@@ -523,8 +517,8 @@ checkPorts (ci_t * ci)
* loopbk mode */
if (log_level >= LOG_DEBUG)
if (value != 0x3f)
- printk (KERN_WARN "%s: BOC value = %x on Port %d\n",
- ci->devname, value, portnum);
+ pr_warning("%s: BOC value = %x on Port %d\n",
+ ci->devname, value, portnum);
/* end ESF loopback code */
}
}
@@ -546,7 +540,7 @@ c4_watchdog (ci_t * ci)
if (drvr_state != SBE_DRVR_AVAILABLE)
{
if (log_level >= LOG_MONITOR)
- printk ("%s: drvr not available (%x)\n", THIS_MODULE->name, drvr_state);
+ pr_info("drvr not available (%x)\n", drvr_state);
return;
}
#if 0
@@ -579,7 +573,7 @@ c4_watchdog (ci_t * ci)
#else
if (log_level >= LOG_MONITOR)
#endif
- printk ("%s: watchdog reviving Port %d Channel %d [%d] sts %x/%x, start_TX %x free %x start_RX %x\n",
+ pr_info("%s: watchdog reviving Port %d Channel %d [%d] sts %x/%x, start_TX %x free %x start_RX %x\n",
ci->devname, ch->channum, port, gchan, ch->channum,
ch->p.status, ch->status,
ch->ch_start_tx, ch->txd_free, ch->ch_start_rx);
@@ -595,7 +589,8 @@ c4_watchdog (ci_t * ci)
{
ch->ch_start_rx = 0; /* we are restarting RX... */
#ifdef RLD_TRANS_DEBUG
- printk ("++ c4_watchdog() CHAN RX ACTIVATE: chan %d\n", ch->channum);
+ pr_info("++ c4_watchdog() CHAN RX ACTIVATE: chan %d\n",
+ ch->channum);
#endif
#ifdef RLD_RXACT_DEBUG
{
@@ -606,7 +601,7 @@ c4_watchdog (ci_t * ci)
{
hereb4--;
md = &ch->mdr[ch->rxix_irq_srv];
- printk ("++ c4_watchdog[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
+ pr_info("++ c4_watchdog[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
ch->channum, ch->rxix_irq_srv, md, le32_to_cpu (md->status), ch->s.rx_packets);
musycc_dump_rxbuffer_ring (ch, 1); /* RLD DEBUG */
}
@@ -636,8 +631,9 @@ c4_watchdog (ci_t * ci)
md = ch->txd_irq_srv;
if (!md)
{
- printk ("-- c4_watchdog[%d]: WARNING, starting NULL md\n", ch->channum);
- printk ("-- chan %d txd_irq_srv %p sts %x usr_add %p sts %x, txpkt %lu\n",
+ pr_info("-- c4_watchdog[%d]: WARNING, starting NULL md\n",
+ ch->channum);
+ pr_info("-- chan %d txd_irq_srv %p sts %x usr_add %p sts %x, txpkt %lu\n",
ch->channum, ch->txd_irq_srv, le32_to_cpu ((struct mdesc *) (ch->txd_irq_srv)->status),
ch->txd_usr_add, le32_to_cpu ((struct mdesc *) (ch->txd_usr_add)->status),
ch->s.tx_packets);
@@ -647,7 +643,8 @@ c4_watchdog (ci_t * ci)
} else if (md->data && ((le32_to_cpu (md->status)) & MUSYCC_TX_OWNED))
{
#ifdef RLD_TRANS_DEBUG
- printk ("++ c4_watchdog[%d] CHAN TX ACTIVATE: start_tx %x\n", ch->channum, ch->ch_start_tx);
+ pr_info("++ c4_watchdog[%d] CHAN TX ACTIVATE: start_tx %x\n",
+ ch->channum, ch->ch_start_tx);
#endif
ch->ch_start_tx = 0; /* we are restarting
* TX... */
@@ -661,7 +658,8 @@ c4_watchdog (ci_t * ci)
#else
if (log_level >= LOG_MONITOR)
#endif
- printk ("++ SACK[P%d/C%d] ack'd, continuing...\n", ch->up->portnum, ch->channum);
+ pr_info("++ SACK[P%d/C%d] ack'd, continuing...\n",
+ ch->up->portnum, ch->channum);
}
}
}
@@ -784,7 +782,7 @@ c4_init (ci_t * ci, u_char *func0, u_char *func1)
pi->p.portnum = portnum;
pi->openchans = 0;
#ifdef SBE_MAP_DEBUG
- printk ("Comet-%d: addr = %p\n", portnum, pi->cometbase);
+ pr_info("Comet-%d: addr = %p\n", portnum, pi->cometbase);
#endif
}
pmsk = c4_get_portcfg (ci);
@@ -811,7 +809,8 @@ c4_init (ci_t * ci, u_char *func0, u_char *func1)
return SBE_DRVR_FAIL;
}
#ifdef SBE_MAP_DEBUG
- printk (">> %s: c4_get_build - pmsk %x max_port %x\n", ci->devname, pmsk, ci->max_port);
+ pr_info(">> %s: c4_get_build - pmsk %x max_port %x\n",
+ ci->devname, pmsk, ci->max_port);
#endif
}
@@ -934,19 +933,20 @@ c4_loop_port (ci_t * ci, int portnum, u_int8_t cmd)
pci_write_32 ((u_int32_t *) &comet->mdiag, cmd);
if (log_level >= LOG_WARN)
- printk ("%s: loopback mode changed to %2x from %2x on Port %d\n",
+ pr_info("%s: loopback mode changed to %2x from %2x on Port %d\n",
ci->devname, cmd, loopValue, portnum);
loopValue = pci_read_32 ((u_int32_t *) &comet->mdiag) & COMET_MDIAG_LBMASK;
if (loopValue != cmd)
{
if (log_level >= LOG_ERROR)
- printk ("%s: write to loop register failed, unknown state for Port %d\n",
+ pr_info("%s: write to loop register failed, unknown state for Port %d\n",
ci->devname, portnum);
}
} else
{
if (log_level >= LOG_WARN)
- printk ("%s: loopback already in that mode (%2x)\n", ci->devname, loopValue);
+ pr_info("%s: loopback already in that mode (%2x)\n",
+ ci->devname, loopValue);
}
return 0;
}
@@ -980,7 +980,7 @@ c4_frame_rw (ci_t * ci, struct sbecom_port_param * pp)
{ /* control says this is a register
* _write_ */
if (pp->portStatus == data)
- printk ("%s: Port %d already that value! Writing again anyhow.\n",
+ pr_info("%s: Port %d already that value! Writing again anyhow.\n",
ci->devname, pp->portnum);
pp->portP = (u_int8_t) data;
pci_write_32 ((u_int32_t *) comet + pp->port_mode,
@@ -1080,11 +1080,11 @@ c4_musycc_rw (ci_t * ci, struct c4_musycc_param * mcp)
if (ramread)
{
data = *dpr;
- //printk ("c4_musycc_rw: RAM addr %p read data %x (portno %x offset %x RAM ramread %x)\n", dpr, data, portnum, offset, ramread); /* RLD DEBUG */
+ //pr_info("c4_musycc_rw: RAM addr %p read data %x (portno %x offset %x RAM ramread %x)\n", dpr, data, portnum, offset, ramread); /* RLD DEBUG */
} else
{
data = pci_read_32 ((u_int32_t *) dph);
- //printk ("c4_musycc_rw: REG addr %p read data %x (portno %x offset %x RAM ramread %x)\n", dph, data, portnum, offset, ramread); /* RLD DEBUG */
+ //pr_info("c4_musycc_rw: REG addr %p read data %x (portno %x offset %x RAM ramread %x)\n", dph, data, portnum, offset, ramread); /* RLD DEBUG */
}
@@ -1092,7 +1092,7 @@ c4_musycc_rw (ci_t * ci, struct c4_musycc_param * mcp)
{ /* control says this is a register
* _write_ */
if (mcp->value == data)
- printk ("%s: musycc grp%d already that value! writing again anyhow.\n",
+ pr_info("%s: musycc grp%d already that value! writing again anyhow.\n",
ci->devname, (mcp->RWportnum & 0x7));
/* write register RAM */
if (ramread)
@@ -1137,7 +1137,7 @@ c4_set_port (ci_t * ci, int portnum)
e1mode = IS_FRAME_ANY_E1 (pp->port_mode);
if (log_level >= LOG_MONITOR2)
{
- printk ("%s: c4_set_port[%d]: entered, e1mode = %x, openchans %d.\n",
+ pr_info("%s: c4_set_port[%d]: entered, e1mode = %x, openchans %d.\n",
ci->devname,
portnum, e1mode, pi->openchans);
}
@@ -1421,13 +1421,12 @@ c4_fifo_alloc (mpi_t * pi, int chan, int *len)
if (max != *len)
{
if (log_level >= LOG_WARN)
- printk (
- "%s: wanted to allocate %d fifo space, but got only %d\n",
+ pr_info("%s: wanted to allocate %d fifo space, but got only %d\n",
pi->up->devname, *len, max);
*len = max;
}
if (log_level >= LOG_DEBUG)
- printk ("%s: allocated %d fifo at %d for channel %d/%d\n",
+ pr_info("%s: allocated %d fifo at %d for channel %d/%d\n",
pi->up->devname, max, start, chan, pi->p.portnum);
for (i = maxstart; i < (maxstart + max); i++)
pi->fifomap[i] = chan;
@@ -1440,7 +1439,7 @@ c4_fifo_free (mpi_t * pi, int chan)
int i;
if (log_level >= LOG_DEBUG)
- printk ("%s: deallocated fifo for channel %d/%d\n",
+ pr_info("%s: deallocated fifo for channel %d/%d\n",
pi->up->devname, chan, pi->p.portnum);
for (i = 0; i < 32; i++)
if (pi->fifomap[i] == chan)
@@ -1465,7 +1464,8 @@ c4_chan_up (ci_t * ci, int channum)
if (ch->state == UP)
{
if (log_level >= LOG_MONITOR)
- printk ("%s: channel already UP, graceful early exit\n", ci->devname);
+ pr_info("%s: channel already UP, graceful early exit\n",
+ ci->devname);
return 0;
}
pi = ch->up;
@@ -1478,9 +1478,10 @@ c4_chan_up (ci_t * ci, int channum)
{
if (1 || log_level >= LOG_WARN)
{
- printk ("%s: c4_chan_up[%d] EINVAL (attempt to cfg in-use or unavailable TimeSlot[%d])\n",
+ pr_info("%s: c4_chan_up[%d] EINVAL (attempt to cfg in-use or unavailable TimeSlot[%d])\n",
ci->devname, channum, i);
- printk ("+ ask4 %x, currently %x\n", ch->p.bitmask[i], pi->tsm[i]);
+ pr_info("+ ask4 %x, currently %x\n",
+ ch->p.bitmask[i], pi->tsm[i]);
}
return EINVAL;
}
@@ -1493,7 +1494,8 @@ c4_chan_up (ci_t * ci, int channum)
if (!nbuf)
{
/* if( log_level >= LOG_WARN) */
- printk ("%s: c4_chan_up[%d] ENOBUFS (no TimeSlots assigned)\n", ci->devname, channum);
+ pr_info("%s: c4_chan_up[%d] ENOBUFS (no TimeSlots assigned)\n",
+ ci->devname, channum);
return ENOBUFS; /* this should not happen */
}
addr = c4_fifo_alloc (pi, gchan, &nbuf);
@@ -1561,7 +1563,7 @@ c4_chan_up (ci_t * ci, int channum)
#if 0
/* DEBUG INFO */
if (log_level >= LOG_MONITOR)
- printk ("%s: mode %x rxnum %d (rxused %d def %d) txnum %d (txused %d def %d)\n",
+ pr_info("%s: mode %x rxnum %d (rxused %d def %d) txnum %d (txused %d def %d)\n",
ci->devname, ch->p.chan_mode,
rxnum, max_rxdesc_used, max_rxdesc_default,
txnum, max_txdesc_used, max_txdesc_default);
@@ -1592,7 +1594,8 @@ c4_chan_up (ci_t * ci, int channum)
if (!(m = OS_mem_token_alloc (max_mru)))
{
if (log_level >= LOG_MONITOR)
- printk ("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n", ci->devname, channum, max_mru);
+ pr_info("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n",
+ ci->devname, channum, max_mru);
goto errfree;
}
md->mem_token = m;
@@ -1638,7 +1641,7 @@ c4_chan_up (ci_t * ci, int channum)
if (ch->p.status & RX_ENABLED)
{
#ifdef RLD_TRANS_DEBUG
- printk ("++ c4_chan_up() CHAN RX ACTIVATE: chan %d\n", ch->channum);
+ pr_info("++ c4_chan_up() CHAN RX ACTIVATE: chan %d\n", ch->channum);
#endif
ch->ch_start_rx = 0; /* we are restarting RX... */
musycc_serv_req (pi, SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION | gchan);
@@ -1646,7 +1649,7 @@ c4_chan_up (ci_t * ci, int channum)
if (ch->p.status & TX_ENABLED)
{
#ifdef RLD_TRANS_DEBUG
- printk ("++ c4_chan_up() CHAN TX ACTIVATE: chan %d <delayed>\n", ch->channum);
+ pr_info("++ c4_chan_up() CHAN TX ACTIVATE: chan %d <delayed>\n", ch->channum);
#endif
ch->ch_start_tx = CH_START_TX_1ST; /* we are delaying start
* until receipt from user of
diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h
index 44229a9..c65172d 100644
--- a/drivers/staging/cxt1e1/sbecom_inline_linux.h
+++ b/drivers/staging/cxt1e1/sbecom_inline_linux.h
@@ -94,7 +94,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 (); /* */
@@ -107,7 +107,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
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index 92f6f5c..4f4dcd3 100644
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -66,7 +66,7 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset,
}
#if 0
/** RLD DEBUG **/
- printk (">> sbecom_proc_get_sbe_info: entered, offset %d. length %d.\n",
+ pr_info(">> sbecom_proc_get_sbe_info: entered, offset %d. length %d.\n",
(int) offset, (int) length);
#endif
@@ -90,7 +90,7 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset,
#if 0
/** RLD DEBUG **/
- printk (">> sbecom_get_brdinfo: returned, first_if %p <%s> last_if %p <%s>\n",
+ pr_info(">> sbecom_get_brdinfo: returned, first_if %p <%s> last_if %p <%s>\n",
(char *) &bip->first_iname, (char *) &bip->first_iname,
(char *) &bip->last_iname, (char *) &bip->last_iname);
#endif
@@ -293,7 +293,7 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset,
#endif
#if 0
- printk (">> proc_fs: returned len = %d., start %p\n", len, start); /* RLD DEBUG */
+ pr_info(">> proc_fs: returned len = %d., start %p\n", len, start); /* RLD DEBUG */
#endif
/***
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH -next] power: fix block_io.c printk warning
2010-05-03 17:06 ` [PATCH -next] power: fix block_io.c printk warning Randy Dunlap
@ 2010-05-03 22:00 ` Rafael J. Wysocki
0 siblings, 0 replies; 10+ messages in thread
From: Rafael J. Wysocki @ 2010-05-03 22:00 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, linux-pm
On Monday 03 May 2010, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix printk format warning in block_io.c:
>
> kernel/power/block_io.c:41: warning: format '%ld' expects type 'long int', but argument 2 has type 'sector_t'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Applied to suspend-2.6/linux-next.
Thanks,
Rafael
> ---
> kernel/power/block_io.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20100503.orig/kernel/power/block_io.c
> +++ linux-next-20100503/kernel/power/block_io.c
> @@ -37,8 +37,8 @@ static int submit(int rw, struct block_d
> bio->bi_end_io = end_swap_bio_read;
>
> if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
> - printk(KERN_ERR "PM: Adding page to bio failed at %ld\n",
> - sector);
> + printk(KERN_ERR "PM: Adding page to bio failed at %llu\n",
> + (unsigned long long)sector);
> bio_put(bio);
> return -EFAULT;
> }
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] staging/cxt1e1: Convert bare printks to pr_<level>
2010-05-03 19:33 ` [PATCH -next] staging/cxt1e1: Convert bare printks to pr_<level> Joe Perches
@ 2010-05-05 12:21 ` Peter Hüwe
2010-05-05 16:21 ` Greg KH
0 siblings, 1 reply; 10+ messages in thread
From: Peter Hüwe @ 2010-05-05 12:21 UTC (permalink / raw)
To: devel
Cc: Joe Perches, Randy Dunlap, devel, Stephen Rothwell, gregkh,
support, LKML, linux-next, support
Am Montag 03 Mai 2010 21:33:16 schrieb Joe Perches:
> 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>
Hi,
I applied Joe's patch, but unfortunately it misses out one part of Randy's
original patch, i.e. the conversion in line 286 of hwprobe.c.
Joe: Can you perhaps add this to your patch?
Thanks,
Peter
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
Copied from original Patch by Randy dunlap
--- linux-next-20100503.orig/drivers/staging/cxt1e1/hwprobe.c
+++ linux-next-20100503/drivers/staging/cxt1e1/hwprobe.c
@@ -282,7 +283,7 @@ c4_hdw_init (struct pci_dev * pdev, int
*/
char *cp = hi->devname;
- strcpy (cp, THIS_MODULE->name);
+ strcpy (cp, KBUILD_MODNAME);
cp += strlen (cp); /* reposition */
*cp++ = '-';
*cp++ = '0' + (found / 2); /* there are two found interfaces per
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] staging/cxt1e1: Convert bare printks to pr_<level>
2010-05-05 12:21 ` Peter Hüwe
@ 2010-05-05 16:21 ` Greg KH
0 siblings, 0 replies; 10+ messages in thread
From: Greg KH @ 2010-05-05 16:21 UTC (permalink / raw)
To: Peter Hüwe
Cc: devel, Joe Perches, Randy Dunlap, devel, Stephen Rothwell, gregkh,
support, LKML, linux-next, support
On Wed, May 05, 2010 at 02:21:14PM +0200, Peter Hüwe wrote:
> Am Montag 03 Mai 2010 21:33:16 schrieb Joe Perches:
> > 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>
>
> Hi,
> I applied Joe's patch, but unfortunately it misses out one part of Randy's
> original patch, i.e. the conversion in line 286 of hwprobe.c.
>
> Joe: Can you perhaps add this to your patch?
I've already applied Joe's patch, so I'll queue up yours as well.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-05-05 16:27 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-03 5:16 linux-next: Tree for May 3 Stephen Rothwell
2010-05-03 17:06 ` [PATCH -next] power: fix block_io.c printk warning Randy Dunlap
2010-05-03 22:00 ` Rafael J. Wysocki
2010-05-03 17:07 ` [PATCH -next] usbserial: fix mos7720 dependencies Randy Dunlap
2010-05-03 17:09 ` [PATCH -next] staging: fix cxt1e1 module names Randy Dunlap
2010-05-03 18:02 ` Joe Perches
2010-05-03 18:06 ` Randy Dunlap
2010-05-03 19:33 ` [PATCH -next] staging/cxt1e1: Convert bare printks to pr_<level> Joe Perches
2010-05-05 12:21 ` Peter Hüwe
2010-05-05 16:21 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).