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

Unverified Commit 8fd6cf6c authored by Petri Gynther's avatar Petri Gynther Committed by Michael Bestas
Browse files

msm: cleanup: union gsi_evt_scratch 



Remove __packed from the usage of union gsi_evt_scratch.
__packed is only needed in the union definition.

include/linux/msm_gsi.h:
union __packed gsi_evt_scratch {
    ...
}

Bug: 139442076
Bug: 139808631
Bug: 140528058
Change-Id: If3d0e1bc2674f01d5a9a02e73d33b28a648539bc
Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
(cherry picked from commit 33c2fa85bdfd90436d4c975757eefc6706a785c5)
parent 4f85193d

drivers/platform/msm/gsi/gsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ int gsi_alloc_evt_ring(struct gsi_evt_ring_props *props, unsigned long dev_hdl, 
EXPORT_SYMBOL(gsi_alloc_evt_ring);



static void __gsi_write_evt_ring_scratch(unsigned long evt_ring_hdl,

		union __packed gsi_evt_scratch val)

		union gsi_evt_scratch val)

{

	gsi_writel(val.data.word1, gsi_ctx->base +

		GSI_EE_n_EV_CH_k_SCRATCH_0_OFFS(evt_ring_hdl,
@@ -1799,7 +1799,7 @@ static void __gsi_write_evt_ring_scratch(unsigned long evt_ring_hdl, 
}



int gsi_write_evt_ring_scratch(unsigned long evt_ring_hdl,

		union __packed gsi_evt_scratch val)

		union gsi_evt_scratch val)

{

	struct gsi_evt_ctx *ctx;

drivers/platform/msm/gsi/gsi.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ struct gsi_evt_ctx { 
	struct completion compl;

	struct gsi_chan_ctx *chan;

	atomic_t chan_ref_cnt;

	union __packed gsi_evt_scratch scratch;

	union gsi_evt_scratch scratch;

	struct gsi_evt_stats stats;

};

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ struct ipa_request_gsi_channel_params { 
	bool skip_ep_cfg;

	bool keep_ipa_awake;

	struct gsi_evt_ring_props evt_ring_params;

	union __packed gsi_evt_scratch evt_scratch;

	union gsi_evt_scratch evt_scratch;

	struct gsi_chan_props chan_params;

	union gsi_channel_scratch chan_scratch;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static int ipa3_wdi2_gsi_alloc_evt_ring( 
			enum ipa_client_type client,

			unsigned long *evt_ring_hdl)

{

	union __packed gsi_evt_scratch evt_scratch;

	union gsi_evt_scratch evt_scratch;

	int result = -EFAULT;



	/* GSI EVENT RING allocation */

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int ipa3_setup_wdi3_gsi_channel(u8 is_smmu_enabled, 
	struct gsi_evt_ring_props gsi_evt_ring_props;

	struct gsi_chan_props gsi_channel_props;

	union gsi_channel_scratch ch_scratch;

	union __packed gsi_evt_scratch evt_scratch;

	union gsi_evt_scratch evt_scratch;

	const struct ipa_gsi_ep_config *gsi_ep_info;

	int result, len;

	unsigned long va;