Where appropriate:
Use #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt or
#define pr_fmt(fmt) "some prefix: " fmt
Remove prefixes
Remove direct function names and use %s...__func__
Convert __FUNCTION__ to __func__
Convert some printks to pr_cont
Convert printk(KERN_<LEVEL> to pr_<level>(
Integrated long strings
Did not do much conversions of bare printks
Some of these are uncompiled and all of them
are untested.
Mostly done via a perl script and some emacs macros:
$ for file in $(find drivers/staging -name "*.[ch]") ; do \
perl -i -e ' \
local $/; \
while (<>) { \
s@\bprintk\s*\(\s*KERN_(INFO|WARNING|ERR|ALERT|CRIT|EMERG|NOTICE)\s*@pr_\L$1\(@g; \
s@\b(pr_[^;]+)\"\s*\n\s*\"@$1@g; \
s@\b(pr_[^;]+)\"\s*\n\s*\"@$1@g; \
s@\b(pr_[^;]+)\"\s*\n\s*\"@$1@g; \
print; \
}' $file ; \
done
Joe Perches (49):
drivers/staging/android: Convert printks to pr_<level>
drivers/staging/asus_oled: Convert printks to pr_<level>
drivers/staging/b3dfg: Convert printks to pr_<level>
drivers/staging/comedi: Convert printks to pr_<level>
drivers/staging/comedi/drivers: Convert printks to pr_<level>
drivers/staging/cx25821: Convert printks to pr_<level>
drivers/staging/dream: Convert printks to pr_<level>
drivers/staging/dream/camera: Convert printks to pr_<level>
drivers/staging/dream/qdsp5: Convert printks to pr_<level>
drivers/staging/dream/smd: Convert printks to pr_<level>
drivers/staging/dst: Convert printks to pr_<level>
drivers/staging/et131x: Convert printks to pr_<level>
drivers/staging/go7007: Convert printks to pr_<level>
drivers/staging/hv: Convert printks to pr_<level>
drivers/staging/iio: Convert printks to pr_<level>
drivers/staging/iio/accel: Convert printks to pr_<level>
drivers/staging/iio/trigger: Convert printks to pr_<level>
drivers/staging/line6: Convert printks to pr_<level>
drivers/staging/mimio: Convert printks to pr_<level>
drivers/staging/octeon: Convert printks to pr_<level>
drivers/staging/otus: Convert printks to pr_<level>
drivers/staging/p9auth: Convert printks to pr_<level>
drivers/staging/panel: Convert printks to pr_<level>
drivers/staging/poch: Convert printks to pr_<level>
drivers/staging/pohmelfs: Convert printks to pr_<level>
drivers/staging/quatech_usb2: Convert printks to pr_<level>
drivers/staging/rar: Convert printks to pr_<level>
drivers/staging/rt2870: Convert printks to pr_<level>
drivers/staging/rt2870/common: Convert printks to pr_<level>
drivers/staging/rt3090: Convert printks to pr_<level>
drivers/staging/rt3090/common: Convert printks to pr_<level>
drivers/staging/rtl8187se: Convert printks to pr_<level>
drivers/staging/rtl8187se/ieee80211: Convert printks to pr_<level>
drivers/staging/rtl8192e: Convert printks to pr_<level>
drivers/staging/rtl8192e/ieee80211: Convert printks to pr_<level>
drivers/staging/rtl8192su: Convert printks to pr_<level>
drivers/staging/rtl8192su/ieee80211: Convert printks to pr_<level>
drivers/staging/sep: Convert printks to pr_<level>
drivers/staging/serqt_usb2: Convert printks to pr_<level>
drivers/staging/slicoss: Convert printks to pr_<level>
drivers/staging/stlc45xx: Convert printks to pr_<level>
drivers/staging/usbip: Convert printks to pr_<level>
drivers/staging/vme: Convert printks to pr_<level>
drivers/staging/vme/bridges: Convert printks to pr_<level>
drivers/staging/vme/devices: Convert printks to pr_<level>
drivers/staging/vt6655: Convert printks to pr_<level>
drivers/staging/vt6656: Convert printks to pr_<level>
drivers/staging/winbond: Convert printks to pr_<level>
drivers/staging/wlan-ng: Convert printks to pr_<level>
drivers/staging/android/binder.c | 294 +++++++-------
drivers/staging/android/logger.c | 10 +-
drivers/staging/android/ram_console.c | 54 ++--
drivers/staging/android/timed_output.c | 5 +-
drivers/staging/asus_oled/asus_oled.c | 24 +-
drivers/staging/b3dfg/b3dfg.c | 9 +-
drivers/staging/comedi/comedi_compat32.c | 12 +-
drivers/staging/comedi/comedi_fops.c | 41 +--
drivers/staging/comedi/drivers/8255.c | 4 +-
drivers/staging/comedi/drivers/acl7225b.c | 4 +-
drivers/staging/comedi/drivers/adl_pci6208.c | 14 +-
drivers/staging/comedi/drivers/adl_pci7296.c | 8 +-
drivers/staging/comedi/drivers/adl_pci7432.c | 8 +-
drivers/staging/comedi/drivers/adl_pci8164.c | 8 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 14 +-
drivers/staging/comedi/drivers/adl_pci9118.c | 12 +-
drivers/staging/comedi/drivers/adq12b.c | 8 +-
drivers/staging/comedi/drivers/adv_pci1710.c | 12 +-
drivers/staging/comedi/drivers/adv_pci1723.c | 4 +-
drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +-
drivers/staging/comedi/drivers/amplc_dio200.c | 32 +-
drivers/staging/comedi/drivers/amplc_pc236.c | 42 +--
drivers/staging/comedi/drivers/amplc_pc263.c | 33 +-
drivers/staging/comedi/drivers/amplc_pci224.c | 54 ++--
drivers/staging/comedi/drivers/amplc_pci230.c | 34 +-
drivers/staging/comedi/drivers/c6xdigio.c | 10 +-
drivers/staging/comedi/drivers/cb_das16_cs.c | 6 +-
drivers/staging/comedi/drivers/cb_pcidas.c | 4 +-
drivers/staging/comedi/drivers/cb_pcidas64.c | 7 +-
drivers/staging/comedi/drivers/cb_pcidda.c | 4 +-
drivers/staging/comedi/drivers/cb_pcidio.c | 4 +-
drivers/staging/comedi/drivers/cb_pcimdas.c | 4 +-
drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +-
drivers/staging/comedi/drivers/comedi_bond.c | 8 +-
drivers/staging/comedi/drivers/comedi_parport.c | 16 +-
drivers/staging/comedi/drivers/comedi_test.c | 5 +-
drivers/staging/comedi/drivers/contec_pci_dio.c | 27 +-
drivers/staging/comedi/drivers/daqboard2000.c | 4 +-
drivers/staging/comedi/drivers/das08.c | 6 +-
drivers/staging/comedi/drivers/das08_cs.c | 4 +-
drivers/staging/comedi/drivers/das16.c | 4 +-
drivers/staging/comedi/drivers/das16m1.c | 4 +-
drivers/staging/comedi/drivers/das1800.c | 4 +-
drivers/staging/comedi/drivers/das6402.c | 2 +-
drivers/staging/comedi/drivers/das800.c | 4 +-
drivers/staging/comedi/drivers/dmm32at.c | 40 +-
drivers/staging/comedi/drivers/dt2811.c | 4 +-
drivers/staging/comedi/drivers/dt2814.c | 4 +-
drivers/staging/comedi/drivers/dt2815.c | 4 +-
drivers/staging/comedi/drivers/dt2817.c | 4 +-
drivers/staging/comedi/drivers/dt282x.c | 4 +-
drivers/staging/comedi/drivers/dt9812.c | 4 +-
drivers/staging/comedi/drivers/fl512.c | 15 +-
drivers/staging/comedi/drivers/gsc_hpdi.c | 7 +-
drivers/staging/comedi/drivers/ii_pci20kc.c | 12 +-
drivers/staging/comedi/drivers/jr3_pci.c | 4 +-
drivers/staging/comedi/drivers/ke_counter.c | 10 +-
drivers/staging/comedi/drivers/me4000.c | 253 +++++--------
drivers/staging/comedi/drivers/me4000.h | 8 +-
drivers/staging/comedi/drivers/me_daq.c | 22 +-
drivers/staging/comedi/drivers/mpc624.c | 4 +-
drivers/staging/comedi/drivers/mpc8260cpm.c | 4 +-
drivers/staging/comedi/drivers/multiq3.c | 10 +-
drivers/staging/comedi/drivers/ni_6527.c | 2 +-
drivers/staging/comedi/drivers/ni_65xx.c | 2 +-
drivers/staging/comedi/drivers/ni_660x.c | 4 +-
drivers/staging/comedi/drivers/ni_670x.c | 4 +-
drivers/staging/comedi/drivers/ni_at_a2150.c | 4 +-
drivers/staging/comedi/drivers/ni_at_ao.c | 4 +-
drivers/staging/comedi/drivers/ni_atmio.c | 2 +-
drivers/staging/comedi/drivers/ni_atmio16d.c | 37 +-
drivers/staging/comedi/drivers/ni_daq_700.c | 14 +-
drivers/staging/comedi/drivers/ni_daq_dio24.c | 44 ++-
drivers/staging/comedi/drivers/ni_labpc.c | 4 +-
drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +-
drivers/staging/comedi/drivers/ni_mio_cs.c | 54 ++--
drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
drivers/staging/comedi/drivers/ni_pcimio.c | 2 +-
drivers/staging/comedi/drivers/pcl711.c | 6 +-
drivers/staging/comedi/drivers/pcl724.c | 4 +-
drivers/staging/comedi/drivers/pcl725.c | 4 +-
drivers/staging/comedi/drivers/pcl726.c | 4 +-
drivers/staging/comedi/drivers/pcl730.c | 4 +-
drivers/staging/comedi/drivers/pcl812.c | 10 +-
drivers/staging/comedi/drivers/pcl816.c | 8 +-
drivers/staging/comedi/drivers/pcl818.c | 8 +-
drivers/staging/comedi/drivers/pcm3724.c | 2 +-
drivers/staging/comedi/drivers/pcm3730.c | 4 +-
drivers/staging/comedi/drivers/pcmad.c | 10 +-
drivers/staging/comedi/drivers/pcmda12.c | 4 +-
drivers/staging/comedi/drivers/pcmmio.c | 4 +-
drivers/staging/comedi/drivers/pcmuio.c | 38 +-
drivers/staging/comedi/drivers/poc.c | 4 +-
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 63 ++--
drivers/staging/comedi/drivers/rtd520.c | 6 +-
drivers/staging/comedi/drivers/rti800.c | 4 +-
drivers/staging/comedi/drivers/rti802.c | 4 +-
drivers/staging/comedi/drivers/s526.c | 4 +-
drivers/staging/comedi/drivers/s626.c | 2 +-
drivers/staging/comedi/drivers/serial2002.c | 4 +-
drivers/staging/comedi/drivers/skel.c | 4 +-
drivers/staging/comedi/drivers/ssv_dnp.c | 4 +-
drivers/staging/comedi/drivers/unioxx5.c | 31 +-
drivers/staging/comedi/drivers/usbdux.c | 95 +++---
drivers/staging/comedi/drivers/usbduxfast.c | 162 +++-----
drivers/staging/comedi/drivers/vmk80xx.c | 17 +-
drivers/staging/cx25821/cx25821-alsa.c | 57 ++--
drivers/staging/cx25821/cx25821-audio-upstream.c | 15 +-
drivers/staging/cx25821/cx25821-audups11.c | 8 +-
drivers/staging/cx25821/cx25821-core.c | 160 ++++----
drivers/staging/cx25821/cx25821-i2c.c | 4 +-
.../staging/cx25821/cx25821-video-upstream-ch2.c | 18 +-
drivers/staging/cx25821/cx25821-video-upstream.c | 18 +-
drivers/staging/cx25821/cx25821-video.c | 12 +-
drivers/staging/cx25821/cx25821-video0.c | 12 +-
drivers/staging/cx25821/cx25821-video1.c | 12 +-
drivers/staging/cx25821/cx25821-video2.c | 12 +-
drivers/staging/cx25821/cx25821-video3.c | 12 +-
drivers/staging/cx25821/cx25821-video4.c | 12 +-
drivers/staging/cx25821/cx25821-video5.c | 12 +-
drivers/staging/cx25821/cx25821-video6.c | 12 +-
drivers/staging/cx25821/cx25821-video7.c | 12 +-
drivers/staging/cx25821/cx25821-videoioctl.c | 8 +-
drivers/staging/cx25821/cx25821-vidups10.c | 8 +-
drivers/staging/cx25821/cx25821-vidups9.c | 8 +-
drivers/staging/cx25821/cx25821.h | 6 +-
drivers/staging/dream/camera/msm_camera.c | 119 +++---
drivers/staging/dream/camera/msm_v4l2.c | 2 +-
drivers/staging/dream/gpio_axis.c | 6 +-
drivers/staging/dream/gpio_event.c | 19 +-
drivers/staging/dream/gpio_input.c | 49 +--
drivers/staging/dream/gpio_matrix.c | 49 ++--
drivers/staging/dream/gpio_output.c | 10 +-
drivers/staging/dream/qdsp5/adsp.c | 106 +++---
drivers/staging/dream/qdsp5/adsp_driver.c | 59 ++--
drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 25 +-
drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 14 +-
drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 23 +-
.../staging/dream/qdsp5/adsp_video_verify_cmd.c | 12 +-
.../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 9 +-
drivers/staging/dream/qdsp5/audio_aac.c | 97 +++---
drivers/staging/dream/qdsp5/audio_in.c | 3 +-
drivers/staging/dream/qdsp5/audio_out.c | 4 +-
drivers/staging/dream/qdsp5/audmgr.c | 48 ++-
drivers/staging/dream/qdsp5/audpp.c | 22 +-
.../staging/dream/smd/rpc_server_dog_keepalive.c | 2 +-
drivers/staging/dream/smd/rpc_server_time_remote.c | 6 +-
drivers/staging/dream/smd/smd.c | 12 +-
drivers/staging/dream/smd/smd_qmi.c | 64 ++--
drivers/staging/dream/smd/smd_rpcrouter.c | 65 ++--
drivers/staging/dream/smd/smd_rpcrouter_device.c | 22 +-
drivers/staging/dream/smd/smd_rpcrouter_servers.c | 7 +-
drivers/staging/dream/smd/smd_tty.c | 2 +-
drivers/staging/dream/synaptics_i2c_rmi.c | 12 +-
drivers/staging/dst/dcore.c | 10 +-
drivers/staging/dst/export.c | 3 +-
drivers/staging/dst/state.c | 4 +-
drivers/staging/et131x/et131x_initpci.c | 2 +-
drivers/staging/et131x/et131x_netdev.c | 13 +-
drivers/staging/go7007/go7007-driver.c | 8 +-
drivers/staging/go7007/go7007-fw.c | 37 +--
drivers/staging/go7007/go7007-i2c.c | 7 +-
drivers/staging/go7007/go7007-usb.c | 103 +++---
drivers/staging/go7007/go7007-v4l2.c | 4 +-
drivers/staging/go7007/s2250-board.c | 36 +-
drivers/staging/go7007/s2250-loader.c | 48 ++--
drivers/staging/go7007/saa7134-go7007.c | 13 +-
drivers/staging/go7007/wis-ov7640.c | 2 +-
drivers/staging/go7007/wis-saa7113.c | 3 +-
drivers/staging/go7007/wis-saa7115.c | 3 +-
drivers/staging/go7007/wis-sony-tuner.c | 80 ++---
drivers/staging/go7007/wis-tw2804.c | 25 +-
drivers/staging/go7007/wis-tw9903.c | 2 +-
drivers/staging/go7007/wis-uda1342.c | 4 +-
drivers/staging/hv/logging.h | 12 +-
drivers/staging/hv/osd.c | 2 +-
drivers/staging/iio/accel/lis3l02dq_core.c | 2 +-
drivers/staging/iio/accel/sca3000_ring.c | 2 +-
drivers/staging/iio/industrialio-core.c | 7 +-
drivers/staging/iio/industrialio-ring.c | 21 +-
drivers/staging/iio/industrialio-trigger.c | 2 +-
drivers/staging/iio/ring_sw.c | 5 +-
drivers/staging/iio/trigger/iio-trig-gpio.c | 2 +-
.../staging/iio/trigger/iio-trig-periodic-rtc.c | 2 +-
drivers/staging/line6/config.h | 4 +-
drivers/staging/line6/driver.c | 6 +-
drivers/staging/line6/driver.h | 4 +-
drivers/staging/mimio/mimio.c | 8 +-
drivers/staging/octeon/cvmx-pow.h | 55 +--
drivers/staging/octeon/ethernet-mem.c | 18 +-
drivers/staging/octeon/ethernet-spi.c | 115 ++----
drivers/staging/octeon/ethernet.c | 21 +-
drivers/staging/otus/ioctl.c | 250 ++++++-------
drivers/staging/otus/usbdrv.c | 20 +-
drivers/staging/otus/wrap_ev.c | 4 +-
drivers/staging/otus/wrap_sec.c | 8 +-
drivers/staging/otus/wrap_usb.c | 10 +-
drivers/staging/otus/wwrap.c | 46 ++--
drivers/staging/otus/zdusb.c | 18 +-
drivers/staging/p9auth/p9auth.c | 27 +-
drivers/staging/panel/panel.c | 28 +-
drivers/staging/poch/poch.c | 72 ++--
drivers/staging/pohmelfs/config.c | 10 +-
drivers/staging/pohmelfs/crypto.c | 58 ++--
drivers/staging/pohmelfs/dir.c | 118 +++---
drivers/staging/pohmelfs/inode.c | 164 ++++----
drivers/staging/pohmelfs/lock.c | 24 +-
drivers/staging/pohmelfs/net.c | 152 ++++----
drivers/staging/pohmelfs/netfs.h | 10 +-
drivers/staging/pohmelfs/path_entry.c | 9 +-
drivers/staging/pohmelfs/trans.c | 76 ++--
drivers/staging/quatech_usb2/quatech_usb2.c | 4 +-
drivers/staging/rar/rar_driver.c | 38 +-
drivers/staging/rar/rar_driver.h | 10 +-
drivers/staging/rt2870/2870_main_dev.c | 12 +-
drivers/staging/rt2870/common/2870_rtmp_init.c | 6 +-
drivers/staging/rt3090/common/crypt_biginteger.c | 2 +-
drivers/staging/rt3090/rt_linux.c | 4 +-
drivers/staging/rt3090/rt_linux.h | 2 +-
drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 +-
.../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 2 +-
.../staging/rtl8187se/ieee80211/ieee80211_module.c | 4 +-
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 23 +-
.../rtl8187se/ieee80211/ieee80211_softmac.c | 30 +-
.../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 4 +-
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 38 +-
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 5 +-
drivers/staging/rtl8187se/r8180.h | 6 +-
drivers/staging/rtl8187se/r8180_core.c | 20 +-
drivers/staging/rtl8187se/r8180_wx.c | 6 +-
drivers/staging/rtl8187se/r8185b_init.c | 2 +-
drivers/staging/rtl8192e/ieee80211.h | 4 +-
drivers/staging/rtl8192e/ieee80211/ieee80211.h | 4 +-
.../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 4 +-
.../staging/rtl8192e/ieee80211/ieee80211_module.c | 8 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 22 +-
.../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 18 +-
.../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 4 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 24 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 5 +-
drivers/staging/rtl8192e/r8192E.h | 6 +-
drivers/staging/rtl8192e/r8192E_core.c | 4 +-
drivers/staging/rtl8192e/r8192_pm.c | 8 +-
drivers/staging/rtl8192su/ieee80211/ieee80211.h | 4 +-
.../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 2 +-
.../staging/rtl8192su/ieee80211/ieee80211_module.c | 8 +-
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 22 +-
.../rtl8192su/ieee80211/ieee80211_softmac.c | 18 +-
.../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 4 +-
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 24 +-
drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 5 +-
drivers/staging/rtl8192su/r8192U_core.c | 22 +-
drivers/staging/rtl8192su/r8192U_pm.c | 8 +-
drivers/staging/sep/sep_driver.c | 401 +++++++++++---------
drivers/staging/sep/sep_driver_config.h | 24 +-
drivers/staging/serqt_usb2/serqt_usb2.c | 5 +-
drivers/staging/slicoss/slicoss.c | 18 +-
drivers/staging/stlc45xx/stlc45xx.c | 2 +
drivers/staging/stlc45xx/stlc45xx.h | 13 +-
drivers/staging/usbip/stub_main.c | 11 +-
drivers/staging/usbip/usbip_common.c | 12 +-
drivers/staging/usbip/usbip_common.h | 15 +-
drivers/staging/usbip/usbip_event.c | 7 +-
drivers/staging/usbip/vhci_hcd.c | 16 +-
drivers/staging/vme/bridges/vme_ca91cx42.c | 74 ++--
drivers/staging/vme/bridges/vme_tsi148.c | 133 +++----
drivers/staging/vme/devices/vme_user.c | 63 ++--
drivers/staging/vme/vme.c | 175 +++++-----
drivers/staging/vt6655/bssdb.c | 4 +-
drivers/staging/vt6655/device_cfg.h | 4 +-
drivers/staging/vt6655/device_main.c | 175 +++++----
drivers/staging/vt6656/device_cfg.h | 4 +-
drivers/staging/vt6656/main_usb.c | 22 +-
drivers/staging/winbond/wbusb.c | 6 +-
drivers/staging/wlan-ng/hfa384x_usb.c | 185 ++++------
drivers/staging/wlan-ng/p80211conv.c | 26 +-
drivers/staging/wlan-ng/p80211netdev.c | 14 +-
drivers/staging/wlan-ng/p80211req.c | 3 +-
drivers/staging/wlan-ng/p80211wext.c | 4 +-
drivers/staging/wlan-ng/prism2fw.c | 148 +++-----
drivers/staging/wlan-ng/prism2mgmt.c | 83 ++---
drivers/staging/wlan-ng/prism2mib.c | 5 +-
drivers/staging/wlan-ng/prism2sta.c | 203 +++++------
drivers/staging/wlan-ng/prism2usb.c | 9 +-
285 files changed, 3475 insertions(+), 3909 deletions(-)
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
