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

Commit 941597ae authored by Steve Cohen's avatar Steve Cohen
Browse files

disp: msm: sde: add doc for sde_dt_props helpers 



Add docstrings for sde_get_dt_props and cleanup error checking
in some call sites.

Change-Id: I031b7a928b894c2db9b8c95863807d77f25176d6
Signed-off-by: default avatarSteve Cohen <cohens@codeaurora.org>
parent 8a690a0b

msm/sde/sde_hw_catalog.c

+23 −9
Original line number Diff line number Diff line
@@ -1140,6 +1140,19 @@ static int _read_dt_entry(struct device_node *np, 
	return rc;

}



/**

 * sde_get_dt_props - allocate and return prop counts, exists & values arrays

 * @np	- device node

 * @prop_max	- <BLK>_PROP_MAX enum, this will be number of values allocated

 * @sde_prop	- pointer to prop table

 * @prop_size	- size of prop table

 * @off_count	- pointer to callers off_count

 *

 * @Returns	- valid pointer or -ve error code (can never return NULL)

 * If a non-NULL off_count pointer is given, the value it points to will be

 * updated with the number of elements in the offset array (entry 0 in table).

 * Caller MUST free this object using sde_put_dt_props after parsing values.

 */

static struct sde_dt_props *sde_get_dt_props(struct device_node *np,

		size_t prop_max, struct sde_prop_type *sde_prop,

		u32 prop_size, u32 *off_count)
@@ -1175,6 +1188,7 @@ static struct sde_dt_props *sde_get_dt_props(struct device_node *np, 
	return ERR_PTR(rc);

}



/* sde_put_dt_props - free an sde_dt_props object obtained with "get" */

static void sde_put_dt_props(struct sde_dt_props *props)

{

	if (!props)
@@ -1814,7 +1828,7 @@ static int sde_ctl_parse_dt(struct device_node *np, 


	props = sde_get_dt_props(np, HW_PROP_MAX, ctl_prop,

			ARRAY_SIZE(ctl_prop), &off_count);

	if (IS_ERR_OR_NULL(props))

	if (IS_ERR(props))

		return PTR_ERR(props);



	sde_cfg->ctl_count = off_count;
@@ -1937,7 +1951,7 @@ static int sde_mixer_parse_dt(struct device_node *np, 


	props = sde_get_dt_props(np, MIXER_PROP_MAX, mixer_prop,

			ARRAY_SIZE(mixer_prop), &off_count);

	if (IS_ERR_OR_NULL(props))

	if (IS_ERR(props))

		return PTR_ERR(props);



	pp_count = sde_cfg->pingpong_count;
@@ -1950,7 +1964,7 @@ static int sde_mixer_parse_dt(struct device_node *np, 
		blocks_props = sde_get_dt_props(snp, MIXER_PROP_MAX,

				mixer_blocks_prop,

				ARRAY_SIZE(mixer_blocks_prop), NULL);

		if (IS_ERR_OR_NULL(blocks_props)) {

		if (IS_ERR(blocks_props)) {

			rc = PTR_ERR(blocks_props);

			goto put_props;

		}
@@ -1960,7 +1974,7 @@ static int sde_mixer_parse_dt(struct device_node *np, 
	blend_props = sde_get_dt_props(np, MIXER_BLEND_PROP_MAX,

			mixer_blend_prop, ARRAY_SIZE(mixer_blend_prop),

			&blend_off_count);

	if (IS_ERR_OR_NULL(blend_props)) {

	if (IS_ERR(blend_props)) {

		rc = PTR_ERR(blend_props);

		goto put_blocks;

	}
@@ -1985,14 +1999,13 @@ static int sde_mixer_parse_dt(struct device_node *np, 
		mixer->sblk = sblk;



		mixer->base = mixer_base;

		mixer->len = PROP_VALUE_ACCESS(props->values, MIXER_LEN, 0);

		mixer->len = !props->exists[MIXER_LEN] ?

				DEFAULT_SDE_HW_BLOCK_LEN :

				PROP_VALUE_ACCESS(props->values, MIXER_LEN, 0);

		mixer->id = LM_0 + i;

		snprintf(mixer->name, SDE_HW_BLK_NAME_LEN, "lm_%u",

				mixer->id - LM_0);



		if (!props->exists[MIXER_LEN])

			mixer->len = DEFAULT_SDE_HW_BLOCK_LEN;



		lm_pair_mask = PROP_VALUE_ACCESS(props->values,

				MIXER_PAIR_MASK, i);

		if (lm_pair_mask)
@@ -2042,7 +2055,8 @@ static int sde_mixer_parse_dt(struct device_node *np, 
			sblk->gc.base = PROP_VALUE_ACCESS(blocks_props->values,

					MIXER_GC_PROP, 0);

			sblk->gc.version = PROP_VALUE_ACCESS(

					blocks_props->values, MIXER_GC_PROP, 1);

					blocks_props->values, MIXER_GC_PROP,

					1);

			sblk->gc.len = 0;

			set_bit(SDE_MIXER_GC, &mixer->features);

		}