From: Purnendu Kapadia <p.kapadia@samsung.com>
Date: Thu, 7 Jun 2018 10:18:14 +0000 (+0100)
Subject: [9610] wlbt: Fix compilation errors Android P mxconf.h (Android P)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b8fd7e4539c5e33009ab1eb52c9fd3f5283eb67;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[9610] wlbt: Fix compilation errors Android P mxconf.h (Android P)

use __packed attribute correctly so that the kernel built
with clang compiler boots.

Change-Id: Ic92e88381553d4db3cb24e1169570786f7fae2b9
SCSC-Bug-Id: SSB-40175
Signed-off-by: Purnendu Kapadia <p.kapadia@samsung.com>
---

diff --git a/drivers/misc/samsung/scsc/mxconf.h b/drivers/misc/samsung/scsc/mxconf.h
index 821a0542fc28..85f5e5e66d0a 100644
--- a/drivers/misc/samsung/scsc/mxconf.h
+++ b/drivers/misc/samsung/scsc/mxconf.h
@@ -48,20 +48,20 @@
 /**
  * Maxwell Circular Packet Buffer Configuration.
  */
-__packed struct mxcbufconf {
+struct mxcbufconf {
 	scsc_mifram_ref buffer_loc;      /**< Location of allocated buffer in DRAM */
 	uint32_t        num_packets;     /**< Total number of packets that can be stored in the buffer */
 	uint32_t        packet_size;     /**< Size of each individual packet within the buffer */
 	scsc_mifram_ref read_index_loc;  /**< Location of 32bit read index in DRAM or Mailbox */
 	scsc_mifram_ref write_index_loc; /**< Location of 32bit write index */
-};
+} __packed;
 
 /**
  * Maxwell Management Simplex Stream Configuration
  *
  * A circular buffer plus a pair of R/W signaling bits.
  */
-__packed struct mxstreamconf {
+struct mxstreamconf {
 	/** Circular Packet Buffer configuration */
 	struct mxcbufconf buf_conf;
 
@@ -70,40 +70,40 @@ __packed struct mxstreamconf {
 
 	/** Allocated MIF Interrupt Write Bit Index */
 	uint8_t           write_bit_idx;
-};
+} __packed;
 
 /**
  * Maxwell Management Transport Configuration
  *
  * A pair of simplex streams.
  */
-__packed struct mxtransconf {
+struct mxtransconf {
 	struct mxstreamconf to_ap_stream_conf;
 	struct mxstreamconf from_ap_stream_conf;
-};
+} __packed;
 
 /**
  * Maxwell Infrastructure Configuration Version
  */
-__packed struct mxconfversion {
+struct mxconfversion {
 	uint16_t major;
 	uint16_t minor;
-};
+} __packed;
 
 /**
   * Mxlog Event Buffer Configuration.
   *
   * A circular buffer. Size must be a multiple of 2.
   */
-__packed struct mxlogconf
+struct mxlogconf
 {
 	struct mxstreamconf stream_conf;
-};
+} __packed;
 
 /**
  * Maxwell Infrastructure Configuration
  */
-__packed struct mxconf {
+struct mxconf {
 	/**
 	 * Config Magic Number
 	 *
@@ -136,6 +136,6 @@ __packed struct mxconf {
 	*/
 	struct mxlogconf mxlogconf;
 
-};
+} __packed;
 
 #endif /* MXCONF_H__ */