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

Commit 944584e1 authored May 19, 2023 by qctecmdr Committed by Gerrit - the friendly Code Review server May 19, 2023

Merge "msm-4.19: Compilation fix for SDLLVM toolchain 16.0"

parents dce80c2a ea2bce2c

drivers/input/touchscreen/st/fts_lib/ftsIO.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ int openChannel(struct i2c_client *clt)
		return OK;
		}

		struct device *getDev()
		struct device *getDev(void)
		{
		if (client != NULL)
		return &(client->dev);
		@@ -90,7 +90,7 @@ struct device *getDev()
		return NULL;
		}

		struct i2c_client *getClient()
		struct i2c_client *getClient(void)
		{
		if (client != NULL)
		return client;

drivers/input/touchscreen/st/fts_lib/ftsTime.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ int elapsedNanosecond(struct StopWatch *w)
		return result;
		}

		char *timestamp()
		char *timestamp(void)
		{
		char *result = NULL;

drivers/video/fbdev/msm/mdss_mdp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4868,7 +4868,7 @@ struct mdss_panel_cfg *mdss_panel_intf_type(int intf_val)
		}
		EXPORT_SYMBOL(mdss_panel_intf_type);

		struct irq_info *mdss_intr_line()
		struct irq_info *mdss_intr_line(void)
		{
		return mdss_mdp_hw.irq_info;
		}

drivers/video/fbdev/msm/mdss_util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ struct mdss_util_intf mdss_util = {
		.mdp_probe_done = false
		};

		struct mdss_util_intf *mdss_get_util_intf()
		struct mdss_util_intf *mdss_get_util_intf(void)
		{
		return &mdss_util;
		}