drivers/staging/intel_sst: Use pr_fmt, fix misspellings
PATCH 1/1 drivers/staging/intel_sst: Use pr_fmt, fix misspellings
Remove leading "sst: " from format strings. Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Prefix is changed from "sst: " to "snd_intel_sst: " Add missing newlines
Trim trailing spaces after newlines
Fix several different misspellings
--- drivers/staging/intel_sst/intel_sst.c | 50 +++--- .../staging/intel_sst/intel_sst_app_interface.c | 140 +++++++------- .../staging/intel_sst/intel_sst_drv_interface.c | 62 +++--- drivers/staging/intel_sst/intel_sst_dsp.c | 67 ++++--- drivers/staging/intel_sst/intel_sst_ipc.c | 144 +++++++------- drivers/staging/intel_sst/intel_sst_pvt.c | 36 ++-- drivers/staging/intel_sst/intel_sst_stream.c | 18 +- .../staging/intel_sst/intel_sst_stream_encoded.c | 205 ++++++++++---------- drivers/staging/intel_sst/intelmid.c | 157 ++++++++-------- drivers/staging/intel_sst/intelmid_ctrl.c | 15 +- drivers/staging/intel_sst/intelmid_msic_control.c | 24 ++- drivers/staging/intel_sst/intelmid_pvt.c | 27 ++-- drivers/staging/intel_sst/intelmid_v0_control.c | 32 ++-- drivers/staging/intel_sst/intelmid_v1_control.c | 28 ++-- drivers/staging/intel_sst/intelmid_v2_control.c | 94 +++++----- 15 files changed, 566 insertions(+), 533 deletions(-)
drivers/staging/intel_sst/intel_sst.c +26 -24
@@ -29,6 +29,8 @@* This file contains all init functions */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/pci.h> #include <linux/fs.h> #include <linux/interrupt.h>
@@ -169,17 +171,17 @@ static int __devinit intel_sst_probe(struct pci_dev *pci, {int i, ret =0 ; -pr_debug ("sst: Probe for DID %x\n" , pci->device); +pr_debug ("Probe for DID %x\n" , pci->device);mutex_lock (&drv_ctx_lock);if (sst_drv_ctx) { -pr_err ("sst: Only one sst handle is supported\n" ); +pr_err ("Only one sst handle is supported\n" );mutex_unlock (&drv_ctx_lock);return -EBUSY ; } sst_drv_ctx =kzalloc (sizeof (*sst_drv_ctx),GFP_KERNEL );if (!sst_drv_ctx) { -pr_err ("sst: intel_sst malloc fail\n" ); +pr_err ("malloc fail\n" );mutex_unlock (&drv_ctx_lock);return -ENOMEM ; }
@@ -226,7 +228,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,spin_lock_init (&sst_drv_ctx->list_spin_lock); sst_drv_ctx->max_streams = pci_id->driver_data; -pr_debug ("sst: Got drv data max stream %d\n" , +pr_debug ("Got drv data max stream %d\n" , sst_drv_ctx->max_streams);for (i =1 ; i <= sst_drv_ctx->max_streams; i++) {struct stream_info *stream = &sst_drv_ctx->streams[i];
@@ -241,18 +243,18 @@ static int __devinit intel_sst_probe(struct pci_dev *pci, sst_drv_ctx->mmap_mem =kzalloc (sst_drv_ctx->mmap_len,GFP_KERNEL );if (sst_drv_ctx->mmap_mem) { -pr_debug ("sst: Got memory %p size 0x%x\n" , +pr_debug ("Got memory %p size 0x%x\n" , sst_drv_ctx->mmap_mem, sst_drv_ctx->mmap_len);break ; }if (sst_drv_ctx->mmap_len < (SST_MMAP_STEP *PAGE_SIZE )) { -pr_err ("sst: mem alloc fail...abort!!\n" ); +pr_err ("mem alloc fail...abort!!\n" ); ret = -ENOMEM ; goto free_process_reply_wq; } sst_drv_ctx->mmap_len -= (SST_MMAP_STEP *PAGE_SIZE ); -pr_debug ("sst:mem alloc failed...trying %d\n" , +pr_debug ("mem alloc failed...trying %d\n" , sst_drv_ctx->mmap_len); } }
@@ -260,7 +262,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,/* Init the device */ ret =pci_enable_device (pci);if (ret) { -pr_err ("sst: device cant be enabled\n" ); +pr_err ("device cant be enabled\n" ); goto do_free_mem; } sst_drv_ctx->pci =pci_dev_get (pci);
@@ -273,25 +275,25 @@ static int __devinit intel_sst_probe(struct pci_dev *pci, sst_drv_ctx->shim =pci_ioremap_bar (pci,1 );if (!sst_drv_ctx->shim) goto do_release_regions; -pr_debug ("sst: SST Shim Ptr %p\n" , sst_drv_ctx->shim); +pr_debug ("SST Shim Ptr %p\n" , sst_drv_ctx->shim);/* Shared SRAM */ sst_drv_ctx->mailbox =pci_ioremap_bar (pci,2 );if (!sst_drv_ctx->mailbox) goto do_unmap_shim; -pr_debug ("sst: SRAM Ptr %p\n" , sst_drv_ctx->mailbox); +pr_debug ("SRAM Ptr %p\n" , sst_drv_ctx->mailbox);/* IRAM */ sst_drv_ctx->iram =pci_ioremap_bar (pci,3 );if (!sst_drv_ctx->iram) goto do_unmap_sram; -pr_debug ("sst:IRAM Ptr %p\n" , sst_drv_ctx->iram); +pr_debug ("IRAM Ptr %p\n" , sst_drv_ctx->iram);/* DRAM */ sst_drv_ctx->dram =pci_ioremap_bar (pci,4 );if (!sst_drv_ctx->dram) goto do_unmap_iram; -pr_debug ("sst: DRAM Ptr %p\n" , sst_drv_ctx->dram); +pr_debug ("DRAM Ptr %p\n" , sst_drv_ctx->dram);mutex_lock (&sst_drv_ctx->sst_lock); sst_drv_ctx->sst_state =SST_UN_INIT ;
@@ -301,24 +303,24 @@ static int __devinit intel_sst_probe(struct pci_dev *pci, IRQF_SHARED, SST_DRV_NAME, sst_drv_ctx);if (ret) goto do_unmap_dram; -pr_debug ("sst: Registered IRQ 0x%x\n" , pci->irq); +pr_debug ("Registered IRQ 0x%x\n" , pci->irq);if (sst_drv_ctx->pci_id ==SST_MRST_PCI_ID ) { ret =misc_register (&lpe_dev);if (ret) { -pr_err ("sst: couldn't register LPE device\n" ); +pr_err ("couldn't register LPE device\n" ); goto do_free_irq; }/*Register LPE Control as misc driver*/ ret =misc_register (&lpe_ctrl);if (ret) { -pr_err ("sst: couldn't register misc driver\n" ); +pr_err ("couldn't register misc driver\n" ); goto do_free_irq; } } sst_drv_ctx->lpe_stalled =0 ; -pr_debug ("sst: ...successfully done!!!\n" ); +pr_debug ("...successfully done!!!\n" );return ret; do_free_irq:
@@ -347,7 +349,7 @@ free_mad_wq:destroy_workqueue (sst_drv_ctx->mad_wq); do_free_drv_ctx:kfree (sst_drv_ctx); -pr_err ("sst: Probe failed with 0x%x\n" , ret); +pr_err ("Probe failed with 0x%x\n" , ret);return ret; }
@@ -404,7 +406,7 @@ int intel_sst_suspend(struct pci_dev *pci, pm_message_t state) {union config_status_reg csr; -pr_debug ("sst: intel_sst_suspend called\n" ); +pr_debug ("intel_sst_suspend called\n" );if (sst_drv_ctx->pb_streams !=0 || sst_drv_ctx->cp_streams !=0 )return -EPERM ;
@@ -434,9 +436,9 @@ int intel_sst_resume(struct pci_dev *pci) {int ret =0 ; -pr_debug ("sst: intel_sst_resume called\n" ); +pr_debug ("intel_sst_resume called\n" );if (sst_drv_ctx->sst_state !=SST_SUSPENDED ) { -pr_err ("sst: SST is not in suspended state\n" ); +pr_err ("SST is not in suspended state\n" );return -EPERM ; } sst_drv_ctx =pci_get_drvdata (pci);
@@ -444,7 +446,7 @@ int intel_sst_resume(struct pci_dev *pci)pci_restore_state (pci); ret =pci_enable_device (pci);if (ret) -pr_err ("sst: device cant be enabled\n" ); +pr_err ("device cant be enabled\n" );mutex_lock (&sst_drv_ctx->sst_lock); sst_drv_ctx->sst_state =SST_UN_INIT ;
@@ -482,14 +484,14 @@ static int __init intel_sst_init(void) {/* Init all variables, data structure etc....*/ int ret =0 ; -pr_debug ("sst: INFO: ******** SST DRIVER loading.. Ver: %s\n" , +pr_debug ("INFO: ******** SST DRIVER loading.. Ver: %s\n" ,SST_DRIVER_VERSION );mutex_init (&drv_ctx_lock);/* Register with PCI */ ret =pci_register_driver (&driver);if (ret) -pr_err ("sst: PCI register failed\n" ); +pr_err ("PCI register failed\n" );return ret; }
@@ -504,7 +506,7 @@ static void __exit intel_sst_exit(void) {pci_unregister_driver (&driver); -pr_debug ("sst: driver unloaded\n" ); +pr_debug ("driver unloaded\n" );return ; }
drivers/staging/intel_sst/intel_sst_app_interface.c +71 -69
495 lines not on this page · raw message
drivers/staging/intel_sst/intel_sst_drv_interface.c +32 -30
210 lines not on this page · raw message
drivers/staging/intel_sst/intel_sst_dsp.c +35 -32
222 lines not on this page · raw message
drivers/staging/intel_sst/intel_sst_ipc.c +73 -71
448 lines not on this page · raw message
drivers/staging/intel_sst/intel_sst_pvt.c +19 -17
@@ -29,6 +29,8 @@* This file contains all private functions */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/pci.h> #include <linux/fs.h> #include <linux/firmware.h>
@@ -60,7 +62,7 @@ int sst_get_block_stream(struct intel_sst_drv *sst_drv_ctx) } }if (i ==MAX_ACTIVE_STREAM ) { -pr_err ("sst: max alloc_stream reached" ); +pr_err ("max alloc_stream reached\n" ); i = -EBUSY ;/* active stream limit reached */ }return i;
@@ -84,14 +86,14 @@ int sst_wait_interruptible(struct intel_sst_drv *sst_drv_ctx, block->condition)) {/* event wake */ if (block->ret_code <0 ) { -pr_err ("sst: stream failed %d\n" , block->ret_code); +pr_err ("stream failed %d\n" , block->ret_code); retval = -EBUSY ; }else { -pr_debug ("sst: event up\n" ); +pr_debug ("event up\n" ); retval =0 ; } } else { -pr_err ("sst: signal interrupted\n" ); +pr_err ("signal interrupted\n" ); retval = -EINTR ; }return retval;
@@ -115,18 +117,18 @@ int sst_wait_interruptible_timeout( {int retval =0 ; -pr_debug ("sst: sst_wait_interruptible_timeout - waiting....\n" ); +pr_debug ("sst_wait_interruptible_timeout - waiting....\n" );if (wait_event_interruptible_timeout (sst_drv_ctx->wait_queue, block->condition,msecs_to_jiffies (timeout))) {if (block->ret_code <0 ) -pr_err ("sst: stream failed %d\n" , block->ret_code); +pr_err ("stream failed %d\n" , block->ret_code);else -pr_debug ("sst: event up\n" ); +pr_debug ("event up\n" ); retval = block->ret_code; }else { block->on = false; -pr_err ("sst: timeout occured...\n" ); +pr_err ("timeout occurred...\n" );/*setting firmware state as uninit so that the firmware will get re-downloaded on next request this is because firmare not responding for 5 sec
@@ -156,18 +158,18 @@ int sst_wait_timeout(struct intel_sst_drv *sst_drv_ctx,/* NOTE: Observed that FW processes the alloc msg and replies even before the alloc thread has finished execution */ -pr_debug ("sst: waiting for %x, condition %x\n" , +pr_debug ("waiting for %x, condition %x\n" , block->sst_id, block->ops_block.condition);if (wait_event_interruptible_timeout (sst_drv_ctx->wait_queue, block->ops_block.condition,msecs_to_jiffies (SST_BLOCK_TIMEOUT ))) {/* event wake */ -pr_debug ("sst: Event wake %x\n" , block->ops_block.condition); -pr_debug ("sst: message ret: %d\n" , block->ops_block.ret_code); +pr_debug ("Event wake %x\n" , block->ops_block.condition); +pr_debug ("message ret: %d\n" , block->ops_block.ret_code); retval = block->ops_block.ret_code; }else { block->ops_block.on = false; -pr_err ("sst: Wait timed-out %x\n" , block->ops_block.condition); +pr_err ("Wait timed-out %x\n" , block->ops_block.condition);/* settign firmware state as uninit so that the firmware will get redownloaded on next request this is because firmare not responding for 5 sec
@@ -192,14 +194,14 @@ int sst_create_large_msg(struct ipc_post **arg) msg =kzalloc (sizeof (struct ipc_post ),GFP_ATOMIC );if (!msg) { -pr_err ("sst: kzalloc msg failed\n" ); +pr_err ("kzalloc msg failed\n" );return -ENOMEM ; } msg->mailbox_data =kzalloc (SST_MAILBOX_SIZE ,GFP_ATOMIC );if (!msg->mailbox_data) {kfree (msg); -pr_err ("sst: kzalloc mailbox_data failed" ); +pr_err ("kzalloc mailbox_data failed" );return -ENOMEM ; }; *arg = msg;
@@ -219,7 +221,7 @@ int sst_create_short_msg(struct ipc_post **arg) msg =kzalloc (sizeof (*msg),GFP_ATOMIC );if (!msg) { -pr_err ("sst: kzalloc msg failed\n" ); +pr_err ("kzalloc msg failed\n" );return -ENOMEM ; } msg->mailbox_data =NULL ;
@@ -290,10 +292,10 @@ int sst_enable_rx_timeslot(int status)struct ipc_post *msg =NULL ;if (sst_create_short_msg (&msg)) { -pr_err ("sst: mem allocation failed\n" ); +pr_err ("mem allocation failed\n" );return -ENOMEM ; } -pr_debug ("sst: ipc message sending: ENABLE_RX_TIME_SLOT\n" ); +pr_debug ("ipc message sending: ENABLE_RX_TIME_SLOT\n" );sst_fill_header (&msg->header,IPC_IA_ENABLE_RX_TIME_SLOT ,0 ,0 ); msg->header.part.data = status; sst_drv_ctx->hs_info_blk.condition = false;
drivers/staging/intel_sst/intel_sst_stream.c +10 -8
@@ -26,6 +26,8 @@* This file contains the stream operations of SST driver */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/pci.h> #include <linux/firmware.h> #include <linux/sched.h>
@@ -46,7 +48,7 @@int sst_check_device_type (u32 device,u32 num_chan,u32 *pcm_slot) {if (device >=MAX_NUM_STREAMS ) { -pr_debug ("sst: device type invalid %d\n" , device); +pr_debug ("device type invalid %d\n" , device);return -EINVAL ; }if (sst_drv_ctx->streams[device].status ==STREAM_UN_INIT ) {
@@ -71,15 +73,15 @@ int sst_check_device_type(u32 device, u32 num_chan, u32 *pcm_slot)else if (device ==SND_SST_DEVICE_CAPTURE && num_chan ==4 ) *pcm_slot =0x0F ;else { -pr_debug ("sst: No condition satisfied.. ret err\n" ); +pr_debug ("No condition satisfied.. ret err\n" );return -EINVAL ; } }else { -pr_debug ("sst: this stream state is not uni-init, is %d\n" , +pr_debug ("this stream state is not uni-init, is %d\n" , sst_drv_ctx->streams[device].status);return -EBADRQC ; } -pr_debug ("sst: returning slot %x\n" , *pcm_slot); +pr_debug ("returning slot %x\n" , *pcm_slot);return 0 ; }/**
@@ -96,7 +98,7 @@ static unsigned int get_mrst_stream_id(void)if (sst_drv_ctx->streams[i].status ==STREAM_UN_INIT )return i; } -pr_debug ("sst: Didnt find empty stream for mrst\n" ); +pr_debug ("Didnt find empty stream for mrst\n" );return -EBUSY ; }
@@ -305,7 +307,7 @@ int sst_pause_stream(int str_id)if (str_info->prev ==STREAM_UN_INIT )return -EBADRQC ;if (str_info->ctrl_blk.on == true) { -pr_err ("SST ERR: control path is in use\n " ); +pr_err ("SST ERR: control path is in use\n" );return -EINVAL ; }if (sst_create_short_msg (&msg))
@@ -333,7 +335,7 @@ int sst_pause_stream(int str_id) } }else { retval = -EBADRQC ; -pr_err ("SST ERR:BADQRC for stream\n " ); +pr_err ("SST ERR: BADQRC for stream\n" ); }return retval;
@@ -468,7 +470,7 @@ int sst_drop_stream(int str_id) } }else { retval = -EBADRQC ; -pr_err ("SST ERR:BADQRC for stream\n" ); +pr_err ("SST ERR: BADQRC for stream\n" ); }return retval; }
drivers/staging/intel_sst/intel_sst_stream_encoded.c +103 -102
664 lines not on this page · raw message
drivers/staging/intel_sst/intelmid.c +80 -77
532 lines not on this page · raw message
drivers/staging/intel_sst/intelmid_ctrl.c +9 -6
@@ -24,6 +24,9 @@* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ALSA driver handling mixer controls for Intel MAD chipset */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <sound/core.h> #include <sound/control.h> #include "jack.h"
@@ -216,7 +219,7 @@ static int snd_intelmad_volume_get(struct snd_kcontrol *kcontrol,struct snd_intelmad *intelmaddata;struct snd_pmic_ops *scard_ops; -pr_debug ("sst: snd_intelmad_volume_get called\n" ); +pr_debug ("snd_intelmad_volume_get called\n" );WARN_ON (!uval);WARN_ON (!kcontrol);
@@ -273,7 +276,7 @@ static int snd_intelmad_mute_get(struct snd_kcontrol *kcontrol,struct snd_intelmad *intelmaddata;struct snd_pmic_ops *scard_ops; -pr_debug ("sst: Mute_get called\n" ); +pr_debug ("Mute_get called\n" );WARN_ON (!uval);WARN_ON (!kcontrol);
@@ -332,7 +335,7 @@ static int snd_intelmad_volume_set(struct snd_kcontrol *kcontrol,struct snd_intelmad *intelmaddata;struct snd_pmic_ops *scard_ops; -pr_debug ("sst: volume set called:%ld %ld\n" , +pr_debug ("volume set called:%ld %ld\n" , uval->value.integer.value[0 ], uval->value.integer.value[1 ]);
@@ -387,7 +390,7 @@ static int snd_intelmad_mute_set(struct snd_kcontrol *kcontrol,struct snd_intelmad *intelmaddata;struct snd_pmic_ops *scard_ops; -pr_debug ("sst: snd_intelmad_mute_set called\n" ); +pr_debug ("snd_intelmad_mute_set called\n" );WARN_ON (!uval);WARN_ON (!kcontrol);
@@ -455,7 +458,7 @@ static int snd_intelmad_device_get(struct snd_kcontrol *kcontrol, {struct snd_intelmad *intelmaddata;struct snd_pmic_ops *scard_ops; -pr_debug ("sst: device_get called\n" ); +pr_debug ("device_get called\n" );WARN_ON (!uval);WARN_ON (!kcontrol);
@@ -492,7 +495,7 @@ static int snd_intelmad_device_set(struct snd_kcontrol *kcontrol,struct snd_pmic_ops *scard_ops;int ret_val =0 , vendor, status; -pr_debug ("sst: snd_intelmad_device_set called\n" ); +pr_debug ("snd_intelmad_device_set called\n" );WARN_ON (!uval);WARN_ON (!kcontrol);
drivers/staging/intel_sst/intelmid_msic_control.c +13 -11
@@ -24,6 +24,8 @@* This file contains the control operations of msic vendors */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/pci.h> #include <linux/file.h> #include "intel_sst.h"
@@ -83,7 +85,7 @@ static int msic_init_card(void) snd_msic_ops.cap_on =0 ; snd_msic_ops.input_dev_id =DMIC ;/*def dev*/ snd_msic_ops.output_dev_id =STEREO_HEADPHONE ; -pr_debug ("sst: msic init complete!!\n" );
Lines of this file are not shown. View the raw message.
drivers/staging/intel_sst/intelmid_pvt.c +15 -12
Lines of this file are not shown. View the raw message.
drivers/staging/intel_sst/intelmid_v0_control.c +17 -15
Lines of this file are not shown. View the raw message.
drivers/staging/intel_sst/intelmid_v1_control.c +15 -13
Lines of this file are not shown. View the raw message.
drivers/staging/intel_sst/intelmid_v2_control.c +48 -46
94 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.