Skip to contentSkip to conversation

staging: ft1000: convert pack pragma to __packed

PATCH New Giedrius Statkevičius 1 participant 1 message Jun 25, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: ft1000: convert pack pragma to __packed

Convert a Microsoft compiler specific directive "#pragma pack(1)" to a GCC equivalent __packed. Also, by doing this we save ourselves from trouble if any other struct definitions are added after the #pragma because it will be applied to all of the definitions following it.

---
v2: Convert __atribute__ ((__packed__)) to __packed as advised by Joe Perches

---
 drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_download.c +1 -2
index 5def347..121792f 100644
@@ -95,7 +95,6 @@ struct dsp_file_hdr {
 	long              nDspImages;          /* Number of DSP images in file. */
 };
 
-#pragma pack(1)
 struct dsp_image_info {
 	long              coff_date;           /* Date/time when DSP Coff image was built. */
 	long              begin_offset;        /* Offset in file where image begins. */
@@ -105,7 +104,7 @@ struct dsp_image_info {
 	long              version;             /* Embedded version # of DSP code. */
 	unsigned short    checksum;            /* DSP File checksum */
 	unsigned short    pad1;
-};
+} __packed;
 
 
 /* checks if the doorbell register is cleared */
Signature · 1 line
2.4.4