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

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

Merge "msm: mdss: change arg type passed into of_get_property"

parents 9f538144 a8e8e977

drivers/video/msm/mdss/mdss_mdp.c

+7 −9
Original line number Diff line number Diff line
@@ -1733,16 +1733,16 @@ static void mdss_mdp_parse_dt_pipe_sw_reset(struct platform_device *pdev, 
	u32 reg_off, char *prop_name, struct mdss_mdp_pipe *pipe_list,

	u32 npipes)

{

	size_t len;

	int len;

	const u32 *arr;



	arr = of_get_property(pdev->dev.of_node, prop_name, (int *) &len);

	arr = of_get_property(pdev->dev.of_node, prop_name, &len);

	if (arr) {

		int i;



		len /= sizeof(u32);

		if (len != npipes) {

			pr_err("%s: invalid sw_reset entries req:%zu found:%d\n",

			pr_err("%s: invalid sw_reset entries req:%d found:%d\n",

				prop_name, len, npipes);

			return;

		}
@@ -1760,14 +1760,12 @@ static void mdss_mdp_parse_dt_pipe_sw_reset(struct platform_device *pdev, 
static int  mdss_mdp_parse_dt_pipe_clk_ctrl(struct platform_device *pdev,

	char *prop_name, struct mdss_mdp_pipe *pipe_list, u32 npipes)

{

	int rc = 0, temp;

	size_t len;

	int rc = 0, len;

	const u32 *arr;



	arr = of_get_property(pdev->dev.of_node, prop_name, &temp);

	arr = of_get_property(pdev->dev.of_node, prop_name, &len);

	if (arr) {

		int i, j;

		len = (size_t) temp;

		len /= sizeof(u32);

		for (i = 0, j = 0; i < len; j++) {

			struct mdss_mdp_pipe *pipe = NULL;
@@ -1817,11 +1815,11 @@ static void mdss_mdp_parse_dt_pipe_panic_ctrl(struct platform_device *pdev, 
	char *prop_name, struct mdss_mdp_pipe *pipe_list, u32 npipes)

{

	int i, j;

	size_t len;

	int len;

	const u32 *arr;

	struct mdss_mdp_pipe *pipe = NULL;



	arr = of_get_property(pdev->dev.of_node, prop_name, (int *) &len);

	arr = of_get_property(pdev->dev.of_node, prop_name, &len);

	if (arr) {

		len /= sizeof(u32);

		for (i = 0, j = 0; i < len; j++) {