Commit 53edf462 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/dpu: Cleanup callers of dpu_hw_blk_init 



Outside of superfluous parameter checks the dpu_hw_blk_init()
doesn't have any failure paths. Switch it over to be a void
function and we can remove error handling paths in all the functions
that call it. While we're in those functions remove unneeded
initialization for a static variable.

v3: No changes
v2: Removed a cleanup intended for a different patch

Reviewed-by: default avatarSean Paul <sean@poorly.run>
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent fa79bcc3

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c

+1 −9
Original line number Diff line number Diff line
@@ -30,16 +30,10 @@ static LIST_HEAD(dpu_hw_blk_list); 
 * @type: hw block type - enum dpu_hw_blk_type

 * @id: instance id of the hw block

 * @ops: Pointer to block operations

 * return: 0 if success; error code otherwise

 */

int dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id,

void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id,

		struct dpu_hw_blk_ops *ops)

{

	if (!hw_blk) {

		pr_err("invalid parameters\n");

		return -EINVAL;

	}



	INIT_LIST_HEAD(&hw_blk->list);

	hw_blk->type = type;

	hw_blk->id = id;
@@ -51,8 +45,6 @@ int dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id, 
	mutex_lock(&dpu_hw_blk_lock);

	list_add(&hw_blk->list, &dpu_hw_blk_list);

	mutex_unlock(&dpu_hw_blk_lock);



	return 0;

}



/**

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct dpu_hw_blk { 
	struct dpu_hw_blk_ops ops;

};



int dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id,

void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id,

		struct dpu_hw_blk_ops *ops);

void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk);

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c

+2 −15
Original line number Diff line number Diff line
@@ -483,10 +483,7 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops, 
	ops->get_bitmask_intf = dpu_hw_ctl_get_bitmask_intf;

};



static struct dpu_hw_blk_ops dpu_hw_ops = {

	.start = NULL,

	.stop = NULL,

};

static struct dpu_hw_blk_ops dpu_hw_ops;



struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx,

		void __iomem *addr,
@@ -494,7 +491,6 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, 
{

	struct dpu_hw_ctl *c;

	struct dpu_ctl_cfg *cfg;

	int rc;



	c = kzalloc(sizeof(*c), GFP_KERNEL);

	if (!c)
@@ -513,18 +509,9 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, 
	c->mixer_count = m->mixer_count;

	c->mixer_hw_caps = m->mixer;



	rc = dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx, &dpu_hw_ops);

	if (rc) {

		DPU_ERROR("failed to init hw blk %d\n", rc);

		goto blk_init_error;

	}

	dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx, &dpu_hw_ops);



	return c;



blk_init_error:

	kzfree(c);



	return ERR_PTR(rc);

}



void dpu_hw_ctl_destroy(struct dpu_hw_ctl *ctx)

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c

+2 −15
Original line number Diff line number Diff line
@@ -264,10 +264,7 @@ static void _setup_intf_ops(struct dpu_hw_intf_ops *ops, 
	ops->get_line_count = dpu_hw_intf_get_line_count;

}



static struct dpu_hw_blk_ops dpu_hw_ops = {

	.start = NULL,

	.stop = NULL,

};

static struct dpu_hw_blk_ops dpu_hw_ops;



struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx,

		void __iomem *addr,
@@ -275,7 +272,6 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, 
{

	struct dpu_hw_intf *c;

	struct dpu_intf_cfg *cfg;

	int rc;



	c = kzalloc(sizeof(*c), GFP_KERNEL);

	if (!c)
@@ -296,18 +292,9 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, 
	c->mdss = m;

	_setup_intf_ops(&c->ops, c->cap->features);



	rc = dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx, &dpu_hw_ops);

	if (rc) {

		DPU_ERROR("failed to init hw blk %d\n", rc);

		goto blk_init_error;

	}

	dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx, &dpu_hw_ops);



	return c;



blk_init_error:

	kzfree(c);



	return ERR_PTR(rc);

}



void dpu_hw_intf_destroy(struct dpu_hw_intf *intf)

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c

+2 −15
Original line number Diff line number Diff line
@@ -175,10 +175,7 @@ static void _setup_mixer_ops(struct dpu_mdss_cfg *m, 
	ops->setup_gc = dpu_hw_lm_gc;

};



static struct dpu_hw_blk_ops dpu_hw_ops = {

	.start = NULL,

	.stop = NULL,

};

static struct dpu_hw_blk_ops dpu_hw_ops;



struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx,

		void __iomem *addr,
@@ -186,7 +183,6 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, 
{

	struct dpu_hw_mixer *c;

	struct dpu_lm_cfg *cfg;

	int rc;



	c = kzalloc(sizeof(*c), GFP_KERNEL);

	if (!c)
@@ -203,18 +199,9 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, 
	c->cap = cfg;

	_setup_mixer_ops(m, &c->ops, c->cap->features);



	rc = dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx, &dpu_hw_ops);

	if (rc) {

		DPU_ERROR("failed to init hw blk %d\n", rc);

		goto blk_init_error;

	}

	dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx, &dpu_hw_ops);



	return c;



blk_init_error:

	kzfree(c);



	return ERR_PTR(rc);

}



void dpu_hw_lm_destroy(struct dpu_hw_mixer *lm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE