[PATCH] drm: gma500: Changed __attribute__((packed)) to __packed

Daniel Vetter daniel at ffwll.ch
Wed Jul 11 07:33:03 UTC 2018


On Tue, Jul 10, 2018 at 03:00:21PM +0200, Eames Trinh wrote:
> Signed-off-by: Eames Trinh <eamestrinh at gmail.com>

Applied, thanks.
-Daniel

> ---
>  drivers/gpu/drm/gma500/intel_bios.h | 38 ++++++++++++++++++-------------------
>  1 file changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/gma500/intel_bios.h b/drivers/gpu/drm/gma500/intel_bios.h
> index 978ae4b25e82..e0ccf1d19a4d 100644
> --- a/drivers/gpu/drm/gma500/intel_bios.h
> +++ b/drivers/gpu/drm/gma500/intel_bios.h
> @@ -34,7 +34,7 @@ struct vbt_header {
>  	u8 reserved0;
>  	u32 bdb_offset;			/**< from beginning of VBT */
>  	u32 aim_offset[4];		/**< from beginning of VBT */
> -} __attribute__((packed));
> +} __packed;
>  
>  
>  struct bdb_header {
> @@ -61,7 +61,7 @@ struct vbios_data {
>  	u8 rsvd4; /* popup memory size */
>  	u8 resize_pci_bios;
>  	u8 rsvd5; /* is crt already on ddc2 */
> -} __attribute__((packed));
> +} __packed;
>  
>  /*
>   * There are several types of BIOS data blocks (BDBs), each block has
> @@ -133,7 +133,7 @@ struct bdb_general_features {
>  	u8 dp_ssc_enb:1;	/* PCH attached eDP supports SSC */
>  	u8 dp_ssc_freq:1;	/* SSC freq for PCH attached eDP */
>  	u8 rsvd11:3; /* finish byte */
> -} __attribute__((packed));
> +} __packed;
>  
>  /* pre-915 */
>  #define GPIO_PIN_DVI_LVDS	0x03 /* "DVI/LVDS DDC GPIO pins" */
> @@ -213,7 +213,7 @@ struct child_device_config {
>  	u8  dvo2_wiring;
>  	u16 extended_type;
>  	u8  dvo_function;
> -} __attribute__((packed));
> +} __packed;
>  
>  
>  struct bdb_general_definitions {
> @@ -256,7 +256,7 @@ struct bdb_lvds_options {
>  	u8 lvds_edid:1;
>  	u8 rsvd2:1;
>  	u8 rsvd4;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct bdb_lvds_backlight {
>  	u8 type:2;
> @@ -268,7 +268,7 @@ struct bdb_lvds_backlight {
>  	u8 i2caddr;
>  	u8 brightnesscmd;
>  	/*FIXME: more...*/
> -} __attribute__((packed));
> +} __packed;
>  
>  /* LFP pointer table contains entries to the struct below */
>  struct bdb_lvds_lfp_data_ptr {
> @@ -278,12 +278,12 @@ struct bdb_lvds_lfp_data_ptr {
>  	u8 dvo_table_size;
>  	u16 panel_pnp_id_offset;
>  	u8 pnp_table_size;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct bdb_lvds_lfp_data_ptrs {
>  	u8 lvds_entries; /* followed by one or more lvds_data_ptr structs */
>  	struct bdb_lvds_lfp_data_ptr ptr[16];
> -} __attribute__((packed));
> +} __packed;
>  
>  /* LFP data has 3 blocks per entry */
>  struct lvds_fp_timing {
> @@ -300,7 +300,7 @@ struct lvds_fp_timing {
>  	u32 pfit_reg;
>  	u32 pfit_reg_val;
>  	u16 terminator;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct lvds_dvo_timing {
>  	u16 clock;		/**< In 10khz */
> @@ -328,7 +328,7 @@ struct lvds_dvo_timing {
>  	u8 vsync_positive:1;
>  	u8 hsync_positive:1;
>  	u8 rsvd2:1;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct lvds_pnp_id {
>  	u16 mfg_name;
> @@ -336,17 +336,17 @@ struct lvds_pnp_id {
>  	u32 serial;
>  	u8 mfg_week;
>  	u8 mfg_year;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct bdb_lvds_lfp_data_entry {
>  	struct lvds_fp_timing fp_timing;
>  	struct lvds_dvo_timing dvo_timing;
>  	struct lvds_pnp_id pnp_id;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct bdb_lvds_lfp_data {
>  	struct bdb_lvds_lfp_data_entry data[16];
> -} __attribute__((packed));
> +} __packed;
>  
>  struct aimdb_header {
>  	char signature[16];
> @@ -354,12 +354,12 @@ struct aimdb_header {
>  	u16 aimdb_version;
>  	u16 aimdb_header_size;
>  	u16 aimdb_size;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct aimdb_block {
>  	u8 aimdb_id;
>  	u16 aimdb_size;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct vch_panel_data {
>  	u16 fp_timing_offset;
> @@ -370,12 +370,12 @@ struct vch_panel_data {
>  	u8 text_fitting_size;
>  	u16 graphics_fitting_offset;
>  	u8 graphics_fitting_size;
> -} __attribute__((packed));
> +} __packed;
>  
>  struct vch_bdb_22 {
>  	struct aimdb_block aimdb_block;
>  	struct vch_panel_data panels[16];
> -} __attribute__((packed));
> +} __packed;
>  
>  struct bdb_sdvo_lvds_options {
>  	u8 panel_backlight;
> @@ -391,7 +391,7 @@ struct bdb_sdvo_lvds_options {
>  	u8 panel_misc_bits_2;
>  	u8 panel_misc_bits_3;
>  	u8 panel_misc_bits_4;
> -} __attribute__((packed));
> +} __packed;
>  
>  #define BDB_DRIVER_FEATURE_NO_LVDS		0
>  #define BDB_DRIVER_FEATURE_INT_LVDS		1
> @@ -436,7 +436,7 @@ struct bdb_driver_features {
>  
>  	u8 hdmi_termination;
>  	u8 custom_vbt_version;
> -} __attribute__((packed));
> +} __packed;
>  
>  #define EDP_18BPP	0
>  #define EDP_24BPP	1
> -- 
> 2.11.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list