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

Commit 2bbe32f7 authored by Liu Ying's avatar Liu Ying Committed by Philipp Zabel
Browse files

gpu: ipu-v3: ipu-dmfc: Make function ipu_dmfc_init_channel() return void 



Since the function ipu_dmfc_init_channel() always returns zero, we may
change the return type to void to simplify the code.

Signed-off-by: default avatarLiu Ying <gnuiyl@gmail.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 32c26a56

drivers/gpu/drm/imx/ipuv3-plane.c

+1 −5
Original line number Diff line number Diff line
@@ -280,11 +280,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, 
		}

	}



	ret = ipu_dmfc_init_channel(ipu_plane->dmfc, crtc_w);

	if (ret) {

		dev_err(dev, "initializing dmfc channel failed with %d\n", ret);

		return ret;

	}

	ipu_dmfc_init_channel(ipu_plane->dmfc, crtc_w);



	ret = ipu_dmfc_alloc_bandwidth(ipu_plane->dmfc,

			calc_bandwidth(crtc_w, crtc_h,

drivers/gpu/ipu-v3/ipu-dmfc.c

+1 −3
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ int ipu_dmfc_alloc_bandwidth(struct dmfc_channel *dmfc, 
}

EXPORT_SYMBOL_GPL(ipu_dmfc_alloc_bandwidth);



int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width)

void ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width)

{

	struct ipu_dmfc_priv *priv = dmfc->priv;

	u32 dmfc_gen1;
@@ -367,8 +367,6 @@ int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width) 
	writel(dmfc_gen1, priv->base + DMFC_GENERAL1);



	mutex_unlock(&priv->mutex);



	return 0;

}

EXPORT_SYMBOL_GPL(ipu_dmfc_init_channel);

include/video/imx-ipu-v3.h

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ void ipu_dmfc_disable_channel(struct dmfc_channel *dmfc); 
int ipu_dmfc_alloc_bandwidth(struct dmfc_channel *dmfc,

		unsigned long bandwidth_mbs, int burstsize);

void ipu_dmfc_free_bandwidth(struct dmfc_channel *dmfc);

int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width);

void ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width);

struct dmfc_channel *ipu_dmfc_get(struct ipu_soc *ipu, int ipuv3_channel);

void ipu_dmfc_put(struct dmfc_channel *dmfc);