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

Unverified Commit 3b0af498 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge remote-tracking branch 'sm8250/lineage-20' into lineage-20 

* sm8250/lineage-20:
  Revert "perf: protect group_leader from races that cause ctx double-free"
  ipa_v3: Fix enum conversion warnings
  thermal: tsens: Fix exported function marked as static
  qca-wifi-host-cmn: Add void keyword to old-style zero prototype functions
  qcacld-3.0: Fix compile error of mdie
  msm: camera: Fix strict-prototypes error
  drivers: rmnet_perf: Fix strict-prototypes error
  input: touchscreen: synaptics_dsx: Fix missing include

Change-Id: I63269913a2c59ca69517e72a872d80287e7a920f
parents 637aef3d 27c94982

drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+2 −2
Original line number Diff line number Diff line
@@ -489,8 +489,8 @@ static void ipa3_copy_qmi_flt_rule_ex( 
	 */

	flt_spec_ptr = (struct ipa_filter_spec_ex_type_v01 *) flt_spec_ptr_void;



	q6_ul_flt_rule_ptr->ip = flt_spec_ptr->ip_type;

	q6_ul_flt_rule_ptr->action = flt_spec_ptr->filter_action;

	q6_ul_flt_rule_ptr->ip = (enum ipa_ip_type)flt_spec_ptr->ip_type;

	q6_ul_flt_rule_ptr->action = (enum ipa_flt_action)flt_spec_ptr->filter_action;

	if (flt_spec_ptr->is_routing_table_index_valid == true)

		q6_ul_flt_rule_ptr->rt_tbl_idx =

		flt_spec_ptr->route_table_index;

drivers/staging/qca-wifi-host-cmn/hif/src/ce/ce_service_legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ struct ce_ops ce_service_legacy = { 
#endif

};



struct ce_ops *ce_services_legacy()

struct ce_ops *ce_services_legacy(void)

{

	return &ce_service_legacy;

}

drivers/staging/qca-wifi-host-cmn/hif/src/ce/ce_service_srng.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ static struct ce_ops ce_service_srng = { 
#endif

};



struct ce_ops *ce_services_srng()

struct ce_ops *ce_services_srng(void)

{

	return &ce_service_srng;

}

drivers/staging/qca-wifi-host-cmn/target_if/core/src/target_if_main.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 


static struct target_if_ctx *g_target_if_ctx;



struct target_if_ctx *target_if_get_ctx()

struct target_if_ctx *target_if_get_ctx(void)

{

	return g_target_if_ctx;

}