summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000
diff options
context:
space:
mode:
authorGiedrius Statkevičius <giedrius.statkevicius@gmail.com>2015-06-25 20:34:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-14 19:52:39 -0700
commitf4bf6b343073e32d5cf8fdb0f38192493fcad5c2 (patch)
treea73f2af4c3716cee7d78c203b7b405f462f28291 /drivers/staging/ft1000
parentd4216b30bdd56fb823c1d32b5e46687ae87601f6 (diff)
downloadblackbird-op-linux-f4bf6b343073e32d5cf8fdb0f38192493fcad5c2.tar.gz
blackbird-op-linux-f4bf6b343073e32d5cf8fdb0f38192493fcad5c2.zip
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. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_download.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index a72511c21200..297b7aece506 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -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 */
OpenPOWER on IntegriCloud