diff options
author | Chris Forbes <chrisf@ijw.co.nz> | 2011-07-02 19:53:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-08 17:51:29 -0400 |
commit | 586073071db01a1f2b939aa31df1e83debb28bf0 (patch) | |
tree | 46d6feca3d0978812b51fb1eedc6e68ada2f4abd /drivers/usb | |
parent | 2cb30bb11963907acdd69f77e77b3fabb16cfa62 (diff) |
drivers: usb: atm: ueagle-atm: use __packed
Replaced __attribute__ ((packed)) with __packed;
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/atm/ueagle-atm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index e71521ce3010..29094574c426 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c | |||
@@ -116,14 +116,14 @@ struct uea_cmvs_v1 { | |||
116 | u32 address; | 116 | u32 address; |
117 | u16 offset; | 117 | u16 offset; |
118 | u32 data; | 118 | u32 data; |
119 | } __attribute__ ((packed)); | 119 | } __packed; |
120 | 120 | ||
121 | struct uea_cmvs_v2 { | 121 | struct uea_cmvs_v2 { |
122 | u32 group; | 122 | u32 group; |
123 | u32 address; | 123 | u32 address; |
124 | u32 offset; | 124 | u32 offset; |
125 | u32 data; | 125 | u32 data; |
126 | } __attribute__ ((packed)); | 126 | } __packed; |
127 | 127 | ||
128 | /* information about currently processed cmv */ | 128 | /* information about currently processed cmv */ |
129 | struct cmv_dsc_e1 { | 129 | struct cmv_dsc_e1 { |
@@ -352,7 +352,7 @@ struct block_index { | |||
352 | __le32 PageAddress; | 352 | __le32 PageAddress; |
353 | __le16 dummy1; | 353 | __le16 dummy1; |
354 | __le16 PageNumber; | 354 | __le16 PageNumber; |
355 | } __attribute__ ((packed)); | 355 | } __packed; |
356 | 356 | ||
357 | #define E4_IS_BOOT_PAGE(PageSize) ((le32_to_cpu(PageSize)) & 0x80000000) | 357 | #define E4_IS_BOOT_PAGE(PageSize) ((le32_to_cpu(PageSize)) & 0x80000000) |
358 | #define E4_PAGE_BYTES(PageSize) ((le32_to_cpu(PageSize) & 0x7fffffff) * 4) | 358 | #define E4_PAGE_BYTES(PageSize) ((le32_to_cpu(PageSize) & 0x7fffffff) * 4) |
@@ -367,7 +367,7 @@ struct l1_code { | |||
367 | u8 page_number_to_block_index[E4_MAX_PAGE_NUMBER]; | 367 | u8 page_number_to_block_index[E4_MAX_PAGE_NUMBER]; |
368 | struct block_index page_header[E4_NO_SWAPPAGE_HEADERS]; | 368 | struct block_index page_header[E4_NO_SWAPPAGE_HEADERS]; |
369 | u8 code[0]; | 369 | u8 code[0]; |
370 | } __attribute__ ((packed)); | 370 | } __packed; |
371 | 371 | ||
372 | /* structures describing a block within a DSP page */ | 372 | /* structures describing a block within a DSP page */ |
373 | struct block_info_e1 { | 373 | struct block_info_e1 { |
@@ -377,7 +377,7 @@ struct block_info_e1 { | |||
377 | __le16 wOvlOffset; | 377 | __le16 wOvlOffset; |
378 | __le16 wOvl; /* overlay */ | 378 | __le16 wOvl; /* overlay */ |
379 | __le16 wLast; | 379 | __le16 wLast; |
380 | } __attribute__ ((packed)); | 380 | } __packed; |
381 | #define E1_BLOCK_INFO_SIZE 12 | 381 | #define E1_BLOCK_INFO_SIZE 12 |
382 | 382 | ||
383 | struct block_info_e4 { | 383 | struct block_info_e4 { |
@@ -387,7 +387,7 @@ struct block_info_e4 { | |||
387 | __be32 dwSize; | 387 | __be32 dwSize; |
388 | __be32 dwAddress; | 388 | __be32 dwAddress; |
389 | __be16 wReserved; | 389 | __be16 wReserved; |
390 | } __attribute__ ((packed)); | 390 | } __packed; |
391 | #define E4_BLOCK_INFO_SIZE 14 | 391 | #define E4_BLOCK_INFO_SIZE 14 |
392 | 392 | ||
393 | #define UEA_BIHDR 0xabcd | 393 | #define UEA_BIHDR 0xabcd |
@@ -467,7 +467,7 @@ struct cmv_e1 { | |||
467 | __le32 dwSymbolicAddress; | 467 | __le32 dwSymbolicAddress; |
468 | __le16 wOffsetAddress; | 468 | __le16 wOffsetAddress; |
469 | __le32 dwData; | 469 | __le32 dwData; |
470 | } __attribute__ ((packed)); | 470 | } __packed; |
471 | 471 | ||
472 | struct cmv_e4 { | 472 | struct cmv_e4 { |
473 | __be16 wGroup; | 473 | __be16 wGroup; |
@@ -475,17 +475,17 @@ struct cmv_e4 { | |||
475 | __be16 wOffset; | 475 | __be16 wOffset; |
476 | __be16 wAddress; | 476 | __be16 wAddress; |
477 | __be32 dwData[6]; | 477 | __be32 dwData[6]; |
478 | } __attribute__ ((packed)); | 478 | } __packed; |
479 | 479 | ||
480 | /* structures representing swap information */ | 480 | /* structures representing swap information */ |
481 | struct swap_info_e1 { | 481 | struct swap_info_e1 { |
482 | __u8 bSwapPageNo; | 482 | __u8 bSwapPageNo; |
483 | __u8 bOvl; /* overlay */ | 483 | __u8 bOvl; /* overlay */ |
484 | } __attribute__ ((packed)); | 484 | } __packed; |
485 | 485 | ||
486 | struct swap_info_e4 { | 486 | struct swap_info_e4 { |
487 | __u8 bSwapPageNo; | 487 | __u8 bSwapPageNo; |
488 | } __attribute__ ((packed)); | 488 | } __packed; |
489 | 489 | ||
490 | /* structures representing interrupt data */ | 490 | /* structures representing interrupt data */ |
491 | #define e1_bSwapPageNo u.e1.s1.swapinfo.bSwapPageNo | 491 | #define e1_bSwapPageNo u.e1.s1.swapinfo.bSwapPageNo |
@@ -499,23 +499,23 @@ union intr_data_e1 { | |||
499 | struct { | 499 | struct { |
500 | struct swap_info_e1 swapinfo; | 500 | struct swap_info_e1 swapinfo; |
501 | __le16 wDataSize; | 501 | __le16 wDataSize; |
502 | } __attribute__ ((packed)) s1; | 502 | } __packed s1; |
503 | struct { | 503 | struct { |
504 | struct cmv_e1 cmv; | 504 | struct cmv_e1 cmv; |
505 | __le16 wDataSize; | 505 | __le16 wDataSize; |
506 | } __attribute__ ((packed)) s2; | 506 | } __packed s2; |
507 | } __attribute__ ((packed)); | 507 | } __packed; |
508 | 508 | ||
509 | union intr_data_e4 { | 509 | union intr_data_e4 { |
510 | struct { | 510 | struct { |
511 | struct swap_info_e4 swapinfo; | 511 | struct swap_info_e4 swapinfo; |
512 | __le16 wDataSize; | 512 | __le16 wDataSize; |
513 | } __attribute__ ((packed)) s1; | 513 | } __packed s1; |
514 | struct { | 514 | struct { |
515 | struct cmv_e4 cmv; | 515 | struct cmv_e4 cmv; |
516 | __le16 wDataSize; | 516 | __le16 wDataSize; |
517 | } __attribute__ ((packed)) s2; | 517 | } __packed s2; |
518 | } __attribute__ ((packed)); | 518 | } __packed; |
519 | 519 | ||
520 | struct intr_pkt { | 520 | struct intr_pkt { |
521 | __u8 bType; | 521 | __u8 bType; |
@@ -528,7 +528,7 @@ struct intr_pkt { | |||
528 | union intr_data_e1 e1; | 528 | union intr_data_e1 e1; |
529 | union intr_data_e4 e4; | 529 | union intr_data_e4 e4; |
530 | } u; | 530 | } u; |
531 | } __attribute__ ((packed)); | 531 | } __packed; |
532 | 532 | ||
533 | #define E1_INTR_PKT_SIZE 28 | 533 | #define E1_INTR_PKT_SIZE 28 |
534 | #define E4_INTR_PKT_SIZE 64 | 534 | #define E4_INTR_PKT_SIZE 64 |