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

Unverified Commit 03fbc69f authored by neoyu's avatar neoyu Committed by Michael Bestas
Browse files

msm: cleanup: union gsi_channel_scratch 



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

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

Bug: 139442076
Bug: 139808631
Bug: 140528058
Change-Id: If59d3d217e6a4bae92b9931523e2f89a39a04be9
Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
(cherry picked from commit 54ace836af62b9fc1edff9c3a436064e177fe2e4)
parent 4cc0643a

drivers/platform/msm/gsi/gsi.c

+6 −6
Original line number Diff line number Diff line
@@ -2549,7 +2549,7 @@ static int gsi_alloc_ap_channel(unsigned int chan_hdl) 
}



static void __gsi_write_channel_scratch(unsigned long chan_hdl,

		union __packed gsi_channel_scratch val)

		union gsi_channel_scratch val)

{

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

		GSI_EE_n_GSI_CH_k_SCRATCH_0_OFFS(chan_hdl,
@@ -2630,7 +2630,7 @@ int gsi_write_channel_scratch2_reg(unsigned long chan_hdl, 
EXPORT_SYMBOL(gsi_write_channel_scratch2_reg);



static void __gsi_read_channel_scratch(unsigned long chan_hdl,

		union __packed gsi_channel_scratch * val)

		union gsi_channel_scratch *val)

{

	val->data.word1 = gsi_readl(gsi_ctx->base +

		GSI_EE_n_GSI_CH_k_SCRATCH_0_OFFS(chan_hdl,
@@ -2649,10 +2649,10 @@ static void __gsi_read_channel_scratch(unsigned long chan_hdl, 
			gsi_ctx->per.ee));

}



static union __packed gsi_channel_scratch __gsi_update_mhi_channel_scratch(

static union gsi_channel_scratch __gsi_update_mhi_channel_scratch(

	unsigned long chan_hdl, struct __packed gsi_mhi_channel_scratch mscr)

{

	union __packed gsi_channel_scratch scr;

	union gsi_channel_scratch scr;



	/* below sequence is not atomic. assumption is sequencer specific fields

	 * will remain unchanged across this sequence
@@ -2709,7 +2709,7 @@ static union __packed gsi_channel_scratch __gsi_update_mhi_channel_scratch( 
}



int gsi_write_channel_scratch(unsigned long chan_hdl,

		union __packed gsi_channel_scratch val)

		union gsi_channel_scratch val)

{

	struct gsi_chan_ctx *ctx;
@@ -2742,7 +2742,7 @@ int gsi_write_channel_scratch(unsigned long chan_hdl, 
EXPORT_SYMBOL(gsi_write_channel_scratch);



int gsi_read_channel_scratch(unsigned long chan_hdl,

		union __packed gsi_channel_scratch *val)

		union gsi_channel_scratch *val)

{

	struct gsi_chan_ctx *ctx;

drivers/platform/msm/gsi/gsi.h

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

	bool allocated;

	atomic_t poll_mode;

	union __packed gsi_channel_scratch scratch;

	union gsi_channel_scratch scratch;

	struct gsi_chan_stats stats;

	bool enable_dp_stats;

	bool print_dp_stats;

drivers/platform/msm/ipa/ipa_api.c

+1 −1
Original line number Diff line number Diff line
@@ -2640,7 +2640,7 @@ bool ipa_has_open_aggr_frame(enum ipa_client_type client) 


int ipa_mhi_resume_channels_internal(enum ipa_client_type client,

		bool LPTransitionRejected, bool brstmode_enabled,

		union __packed gsi_channel_scratch ch_scratch, u8 index)

		union gsi_channel_scratch ch_scratch, u8 index)

{

	int ret;

drivers/platform/msm/ipa/ipa_api.h

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ struct ipa_api_controller { 
			enum ipa_client_type client,

			bool LPTransitionRejected,

			bool brstmode_enabled,

			union __packed gsi_channel_scratch ch_scratch,

			union gsi_channel_scratch ch_scratch,

			u8 index);



	int  (*ipa_mhi_destroy_channel)(enum ipa_client_type client);

drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct ipa_mhi_channel_ctx { 
	u64 event_context_addr;

	struct ipa_mhi_ev_ctx ev_ctx_host;

	bool brstmode_enabled;

	union __packed gsi_channel_scratch ch_scratch;

	union gsi_channel_scratch ch_scratch;

	unsigned long cached_gsi_evt_ring_hdl;

};