Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a332d21c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Bluetooth: Enhance logging in btfm slim & audio codec drivers"

parents b590e789 3815c79d

drivers/bluetooth/btfm_slim.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int btfm_slim_enable_ch(struct btfmslim *btfmslim, struct btfmslim_ch *ch, 
	if (!btfmslim || !ch)

		return -EINVAL;



	BTFMSLIM_DBG("port:%d", ch->port);

	BTFMSLIM_DBG("port: %d ch: %d", ch->port, ch->ch);



	/* Define the channel with below parameters */

	prop.prot = SLIM_AUTO_ISO;

drivers/bluetooth/btfm_slim.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define BTFM_SLIM_H

#include <linux/slimbus/slimbus.h>



#define BTFMSLIM_DBG(fmt, arg...)  pr_debug("%s: " fmt "\n", __func__, ## arg)

#define BTFMSLIM_DBG(fmt, arg...)  pr_debug(fmt "\n", ## arg)

#define BTFMSLIM_INFO(fmt, arg...) pr_info("%s: " fmt "\n", __func__, ## arg)

#define BTFMSLIM_ERR(fmt, arg...)  pr_err("%s: " fmt "\n", __func__, ## arg)

drivers/bluetooth/btfm_slim_codec.c

+8 −8
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ static int btfm_slim_dai_startup(struct snd_pcm_substream *substream, 
	int ret;

	struct btfmslim *btfmslim = dai->dev->platform_data;



	BTFMSLIM_DBG("substream = %s  stream = %d",

		 substream->name, substream->stream);

	BTFMSLIM_DBG("substream = %s  stream = %d dai name = %s",

		 substream->name, substream->stream, dai->name);

	ret = btfm_slim_hw_init(btfmslim);

	return ret;

}
@@ -65,8 +65,8 @@ static void btfm_slim_dai_shutdown(struct snd_pcm_substream *substream, 
{

	struct btfmslim *btfmslim = dai->dev->platform_data;



	BTFMSLIM_DBG("substream = %s  stream = %d",

		 substream->name, substream->stream);

	BTFMSLIM_DBG("substream = %s  stream = %d dai name = %s",

		 substream->name, substream->stream, dai->name);

	btfm_slim_hw_deinit(btfmslim);

}
@@ -74,7 +74,7 @@ static int btfm_slim_dai_hw_params(struct snd_pcm_substream *substream, 
			    struct snd_pcm_hw_params *params,

			    struct snd_soc_dai *dai)

{

	BTFMSLIM_DBG("dai_name = %s DAI-ID %x rate %d num_ch %d",

	BTFMSLIM_DBG("dai name = %s DAI-ID %x rate %d num_ch %d",

		dai->name, dai->id, params_rate(params),

		params_channels(params));
@@ -89,7 +89,7 @@ int btfm_slim_dai_prepare(struct snd_pcm_substream *substream, 
	struct btfmslim_ch *ch;

	uint8_t rxport, grp = false, nchan = 1;



	BTFMSLIM_DBG("dai->name:%s, dai->id: %d, dai->rate: %d", dai->name,

	BTFMSLIM_DBG("dai name: %s, dai->id: %d, dai->rate: %d", dai->name,

		dai->id, dai->rate);



	switch (dai->id) {
@@ -137,7 +137,7 @@ int btfm_slim_dai_hw_free(struct snd_pcm_substream *substream, 
	struct btfmslim_ch *ch;

	uint8_t rxport, grp = false, nchan = 1;



	BTFMSLIM_DBG("dai->name:%s, dai->id: %d, dai->rate: %d", dai->name,

	BTFMSLIM_DBG("dai name: %s, dai->id: %d, dai->rate: %d", dai->name,

		dai->id, dai->rate);



	switch (dai->id) {

drivers/bluetooth/btfm_slim_wcn3990.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int btfm_slim_chrk_enable_port(struct btfmslim *btfmslim, uint8_t port_num, 
	uint8_t reg_val = 0;

	uint16_t reg;



	BTFMSLIM_DBG("enable(%d)", enable);

	BTFMSLIM_DBG("port(%d) enable(%d)", port_num, enable);

	if (rxport) {

		/* Port enable */

		reg = CHRK_SB_PGD_PORT_RX_CFGN(port_num - 0x10);