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

Commit 99a1383f authored by Gopikrishnaiah Anandan's avatar Gopikrishnaiah Anandan
Browse files

drivers: mfd: Cleanup of wcd drivers 



Kernel has defined printk format specifiers and typedefs
for datatypes.
Using the format strings will remove need for typecasting.
This change cleans up wcd msm drivers to use the kernel
defined data types and format specifiers for printk.

Change-Id: I9f451d0fc5eb15a93a51b6ffe647b6990c9e9dc1
Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent 219364c5

drivers/mfd/wcd9xxx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static struct wcd9xxx_pdata *wcd9xxx_populate_dt_pdata(struct device *dev) 
	BUG_ON(static_cnt <= 0 || ond_cnt < 0 || cp_supplies_cnt < 0);

	if ((static_cnt + ond_cnt + cp_supplies_cnt)

			> ARRAY_SIZE(pdata->regulator)) {

		dev_err(dev, "%s: Num of supplies %u > max supported %u\n",

		dev_err(dev, "%s: Num of supplies %u > max supported %zu\n",

			__func__, static_cnt, ARRAY_SIZE(pdata->regulator));

		goto err;

	}

drivers/mfd/wcd9xxx-slimslave.c

+12 −10
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -230,10 +230,10 @@ int wcd9xxx_cfg_slim_sch_rx(struct wcd9xxx *wcd9xxx, 


	list_for_each_entry(rx, wcd9xxx_ch_list, list) {

		codec_port = rx->port;

		pr_debug("%s: codec_port %d rx 0x%x, payload %d\n"

		pr_debug("%s: codec_port %d rx 0x%p, payload %d\n"

			 "sh_ch.rx_port_ch_reg_base0 0x%x\n"

			 "sh_ch.port_rx_cfg_reg_base 0x%x\n",

			 __func__, codec_port, (u32)rx, payload,

			 __func__, codec_port, rx, payload,

			 sh_ch.rx_port_ch_reg_base,

			sh_ch.port_rx_cfg_reg_base);
@@ -328,8 +328,8 @@ int wcd9xxx_cfg_slim_sch_tx(struct wcd9xxx *wcd9xxx, 
	pr_debug("%s: ch_cnt[%d] rate[%d]\n", __func__, ch_cnt, rate);

	list_for_each_entry(tx, wcd9xxx_ch_list, list) {

		codec_port = tx->port;

		pr_debug("%s: codec_port %d rx 0x%x, payload 0x%x\n",

			 __func__, codec_port, (u32)tx, payload);

		pr_debug("%s: codec_port %d tx 0x%p, payload 0x%x\n",

			 __func__, codec_port, tx, payload);

		/* write to interface device */

		ret = wcd9xxx_interface_reg_write(wcd9xxx,

				SB_PGD_TX_PORT_MULTI_CHANNEL_0(codec_port),
@@ -498,20 +498,22 @@ EXPORT_SYMBOL_GPL(wcd9xxx_rx_vport_validation); 




/* This function is called with mutex acquired */

int wcd9xxx_tx_vport_validation(u32 vtable, u32 port_id,

int wcd9xxx_tx_vport_validation(u32 table, u32 port_id,

				struct wcd9xxx_codec_dai_data *codec_dai)

{

	struct wcd9xxx_ch *ch;

	int ret = 0;

	u32 index;

	u32 size = sizeof(vtable) * 8;

	pr_debug("%s: vtable 0x%x port_id %u size %d\n", __func__,

	unsigned long vtable = table;

	u32 size = sizeof(table) * BITS_PER_BYTE;



	pr_debug("%s: vtable 0x%lx port_id %u size %d\n", __func__,

		 vtable, port_id, size);

	for_each_set_bit(index, (unsigned long *)&vtable, size) {

	for_each_set_bit(index, &vtable, size) {

		list_for_each_entry(ch,

				    &codec_dai[index].wcd9xxx_ch_list,

				    list) {

			pr_debug("%s: index %u ch->port %u vtable 0x%x\n",

			pr_debug("%s: index %u ch->port %u vtable 0x%lx\n",

				 __func__, index, ch->port, vtable);

			if (ch->port == port_id) {

				pr_err("%s: TX%u is used by AIF%u_CAP Mixer\n",

sound/soc/codecs/wcd9xxx-resmgr.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -860,7 +860,7 @@ int wcd9xxx_resmgr_init(struct wcd9xxx_resmgr *resmgr, 
			enum wcd9xxx_cdc_type cdc_type)

{

	WARN(ARRAY_SIZE(wcd9xxx_event_string) != WCD9XXX_EVENT_LAST + 1,

	     "Event string table isn't up to date!, %d != %d\n",

	     "Event string table isn't up to date!, %zd != %d\n",

	     ARRAY_SIZE(wcd9xxx_event_string), WCD9XXX_EVENT_LAST + 1);



	resmgr->bandgap_type = WCD9XXX_BANDGAP_OFF;