AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: bcm2835-audio: Use standard error print helpers

Browse Source 
For making the whole code more consistent, replace the home-made debug
print macros with the standard dev_err() & co.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai 2018-09-04 17:58:51 +02:00 committed by Greg Kroah-Hartman
parent be2af4715f
commit 435ba133f9
4 changed files with 27 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
View File

@ -101,8 +101,8 @@ static int snd_bcm2835_playback_open_generic(
goto out; goto out;
} }
if (idx >= MAX_SUBSTREAMS) { if (idx >= MAX_SUBSTREAMS) {
audio_error dev_err(chip->dev,
("substream(%d) device doesn't exist max(%d) substreams allowed\n", "substream(%d) device doesn't exist max(%d) substreams allowed\n",
idx, MAX_SUBSTREAMS); idx, MAX_SUBSTREAMS);
err = -ENODEV; err = -ENODEV;
goto out; goto out;

52
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
View File

@ -26,20 +26,8 @@
/* ---- Private Constants and Types ------------------------------------------ */ /* ---- Private Constants and Types ------------------------------------------ */
/* Logging macros (for remapping to other logging mechanisms, i.e., printf) */
#ifdef AUDIO_DEBUG_ENABLE
#define LOG_ERR(fmt, arg...) pr_err("%s:%d " fmt, __func__, __LINE__, ##arg)
#define LOG_WARN(fmt, arg...) pr_info("%s:%d " fmt, __func__, __LINE__, ##arg)
#define LOG_INFO(fmt, arg...) pr_info("%s:%d " fmt, __func__, __LINE__, ##arg)
#define LOG_DBG(fmt, arg...) pr_info("%s:%d " fmt, __func__, __LINE__, ##arg)
#else
#define LOG_ERR(fmt, arg...) pr_err("%s:%d " fmt, __func__, __LINE__, ##arg)
#define LOG_WARN(fmt, arg...) no_printk(fmt, ##arg)
#define LOG_INFO(fmt, arg...) no_printk(fmt, ##arg)
#define LOG_DBG(fmt, arg...) no_printk(fmt, ##arg)
#endif
struct bcm2835_audio_instance { struct bcm2835_audio_instance {
struct device *dev;
VCHI_SERVICE_HANDLE_T vchi_handle; VCHI_SERVICE_HANDLE_T vchi_handle;
struct completion msg_avail_comp; struct completion msg_avail_comp;
struct mutex vchi_mutex; struct mutex vchi_mutex;
@ -76,7 +64,8 @@ static int bcm2835_audio_send_msg_locked(struct bcm2835_audio_instance *instance
status = vchi_queue_kernel_message(instance->vchi_handle, status = vchi_queue_kernel_message(instance->vchi_handle,
m, sizeof(*m)); m, sizeof(*m));
if (status) { if (status) {
LOG_ERR("vchi message queue failed: %d, msg=%d\n", dev_err(instance->dev,
"vchi message queue failed: %d, msg=%d\n",
status, m->type); status, m->type);
return -EIO; return -EIO;
} }
@ -84,10 +73,12 @@ static int bcm2835_audio_send_msg_locked(struct bcm2835_audio_instance *instance
if (wait) { if (wait) {
if (!wait_for_completion_timeout(&instance->msg_avail_comp, if (!wait_for_completion_timeout(&instance->msg_avail_comp,
msecs_to_jiffies(10 * 1000))) { msecs_to_jiffies(10 * 1000))) {
LOG_ERR("vchi message timeout, msg=%d\n", m->type); dev_err(instance->dev,
"vchi message timeout, msg=%d\n", m->type);
return -ETIMEDOUT; return -ETIMEDOUT;
} else if (instance->result) { } else if (instance->result) {
LOG_ERR("vchi message response error:%d, msg=%d\n", dev_err(instance->dev,
"vchi message response error:%d, msg=%d\n",
instance->result, m->type); instance->result, m->type);
return -EIO; return -EIO;
} }
@ -140,12 +131,12 @@ static void audio_vchi_callback(void *param,
} else if (m.type == VC_AUDIO_MSG_TYPE_COMPLETE) { } else if (m.type == VC_AUDIO_MSG_TYPE_COMPLETE) {
if (m.u.complete.cookie1 != BCM2835_AUDIO_WRITE_COOKIE1 || if (m.u.complete.cookie1 != BCM2835_AUDIO_WRITE_COOKIE1 ||
m.u.complete.cookie2 != BCM2835_AUDIO_WRITE_COOKIE2) m.u.complete.cookie2 != BCM2835_AUDIO_WRITE_COOKIE2)
LOG_ERR("invalid cookie\n"); dev_err(instance->dev, "invalid cookie\n");
else else
bcm2835_playback_fifo(instance->alsa_stream, bcm2835_playback_fifo(instance->alsa_stream,
m.u.complete.count); m.u.complete.count);
} else { } else {
LOG_ERR("unexpected callback type=%d\n", m.type); dev_err(instance->dev, "unexpected callback type=%d\n", m.type);
} }
} }
@ -173,8 +164,9 @@ vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,
&instance->vchi_handle); &instance->vchi_handle);
if (status) { if (status) {
LOG_ERR("%s: failed to open VCHI service connection (status=%d)\n", dev_err(instance->dev,
__func__, status); "failed to open VCHI service connection (status=%d)\n",
status);
kfree(instance); kfree(instance);
return -EPERM; return -EPERM;
} }
@ -195,30 +187,30 @@ static void vc_vchi_audio_deinit(struct bcm2835_audio_instance *instance)
/* Close all VCHI service connections */ /* Close all VCHI service connections */
status = vchi_service_close(instance->vchi_handle); status = vchi_service_close(instance->vchi_handle);
if (status) { if (status) {
LOG_DBG("%s: failed to close VCHI service connection (status=%d)\n", dev_err(instance->dev,
__func__, status); "failed to close VCHI service connection (status=%d)\n",
status);
} }
mutex_unlock(&instance->vchi_mutex); mutex_unlock(&instance->vchi_mutex);
} }
int bcm2835_new_vchi_ctx(struct bcm2835_vchi_ctx *vchi_ctx) int bcm2835_new_vchi_ctx(struct device *dev, struct bcm2835_vchi_ctx *vchi_ctx)
{ {
int ret; int ret;
/* Initialize and create a VCHI connection */ /* Initialize and create a VCHI connection */
ret = vchi_initialise(&vchi_ctx->vchi_instance); ret = vchi_initialise(&vchi_ctx->vchi_instance);
if (ret) { if (ret) {
LOG_ERR("%s: failed to initialise VCHI instance (ret=%d)\n", dev_err(dev, "failed to initialise VCHI instance (ret=%d)\n",
__func__, ret); ret);
return -EIO; return -EIO;
} }
ret = vchi_connect(NULL, 0, vchi_ctx->vchi_instance); ret = vchi_connect(NULL, 0, vchi_ctx->vchi_instance);
if (ret) { if (ret) {
LOG_ERR("%s: failed to connect VCHI instance (ret=%d)\n", dev_dbg(dev, "failed to connect VCHI instance (ret=%d)\n",
__func__, ret); ret);
kfree(vchi_ctx->vchi_instance); kfree(vchi_ctx->vchi_instance);
vchi_ctx->vchi_instance = NULL; vchi_ctx->vchi_instance = NULL;
@ -248,6 +240,7 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
if (!instance) if (!instance)
return -ENOMEM; return -ENOMEM;
mutex_init(&instance->vchi_mutex); mutex_init(&instance->vchi_mutex);
instance->dev = alsa_stream->chip->dev;
instance->alsa_stream = alsa_stream; instance->alsa_stream = alsa_stream;
alsa_stream->instance = instance; alsa_stream->instance = instance;
@ -394,7 +387,8 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,
} }
if (status) { if (status) {
LOG_ERR("failed on %d bytes transfer (status=%d)\n", dev_err(instance->dev,
"failed on %d bytes transfer (status=%d)\n",
size, status); size, status);
err = -EIO; err = -EIO;
} }

2
drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
View File

@ -73,7 +73,7 @@ static int bcm2835_devm_add_vchi_ctx(struct device *dev)
memset(vchi_ctx, 0, sizeof(*vchi_ctx)); memset(vchi_ctx, 0, sizeof(*vchi_ctx));
ret = bcm2835_new_vchi_ctx(vchi_ctx); ret = bcm2835_new_vchi_ctx(dev, vchi_ctx);
if (ret) { if (ret) {
devres_free(vchi_ctx); devres_free(vchi_ctx);
return ret; return ret;

43
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
View File

@ -17,47 +17,6 @@
#include "interface/vchi/vchi.h" #include "interface/vchi/vchi.h"
/*
* #define AUDIO_DEBUG_ENABLE
* #define AUDIO_VERBOSE_DEBUG_ENABLE
*/
/* Debug macros */
#ifdef AUDIO_DEBUG_ENABLE
#ifdef AUDIO_VERBOSE_DEBUG_ENABLE
#define audio_debug(fmt, arg...) \
pr_info("%s:%d " fmt, __func__, __LINE__, ##arg)
#define audio_info(fmt, arg...) \
pr_info("%s:%d " fmt, __func__, __LINE__, ##arg)
#else
#define audio_debug(fmt, arg...)
#define audio_info(fmt, arg...)
#endif /* AUDIO_VERBOSE_DEBUG_ENABLE */
#else
#define audio_debug(fmt, arg...)
#define audio_info(fmt, arg...)
#endif /* AUDIO_DEBUG_ENABLE */
#define audio_error(fmt, arg...) \
pr_err("%s:%d " fmt, __func__, __LINE__, ##arg)
#define audio_warning(fmt, arg...) \
pr_warn("%s:%d " fmt, __func__, __LINE__, ##arg)
#define audio_alert(fmt, arg...) \
pr_alert("%s:%d " fmt, __func__, __LINE__, ##arg)
#define MAX_SUBSTREAMS (8) #define MAX_SUBSTREAMS (8)
#define AVAIL_SUBSTREAMS_MASK (0xff) #define AVAIL_SUBSTREAMS_MASK (0xff)
@ -141,7 +100,7 @@ int snd_bcm2835_new_simple_pcm(struct bcm2835_chip *chip,
int snd_bcm2835_new_hdmi_ctl(struct bcm2835_chip *chip); int snd_bcm2835_new_hdmi_ctl(struct bcm2835_chip *chip);
int snd_bcm2835_new_headphones_ctl(struct bcm2835_chip *chip); int snd_bcm2835_new_headphones_ctl(struct bcm2835_chip *chip);
int bcm2835_new_vchi_ctx(struct bcm2835_vchi_ctx *vchi_ctx); int bcm2835_new_vchi_ctx(struct device *dev, struct bcm2835_vchi_ctx *vchi_ctx);
void bcm2835_free_vchi_ctx(struct bcm2835_vchi_ctx *vchi_ctx); void bcm2835_free_vchi_ctx(struct bcm2835_vchi_ctx *vchi_ctx);
int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream); int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream);