Fixed style issues for various nouveau files. Fix some whitespace and brace issues for the various nouveau files. I found the errors using checkpatch.pl Signed-off-by: Josiah Humphrey <[email protected]>
Subsystems (3)
PATCH 1/1 Fixed style issues for various nouveau files. Fix some whitespace and brace issues for the various nouveau files. I found the errors using checkpatch.pl Signed-off-by: Josiah Humphrey <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 ++--- drivers/gpu/drm/nouveau/nouveau_bios.c | 28 +++++++++++++++++----------- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_grctx.h | 10 +++++----- drivers/gpu/drm/nouveau/nouveau_hw.h | 2 +- drivers/gpu/drm/nouveau/nouveau_reg.h | 12 ++++++------ 6 files changed, 32 insertions(+), 27 deletions(-)
drivers/gpu/drm/nouveau/nouveau_acpi.c +2 -3
@@ -151,11 +151,10 @@ static bool nouveau_dsm_pci_probe(struct pci_dev *pdev)if (!dhandle)return false; status =acpi_get_handle (dhandle,"_DSM" , &nvidia_handle); -if (ACPI_FAILURE (status)) { +if (ACPI_FAILURE (status))return false; - } - ret=nouveau_dsm (nvidia_handle,NOUVEAU_DSM_SUPPORTED , + ret =nouveau_dsm (nvidia_handle,NOUVEAU_DSM_SUPPORTED ,NOUVEAU_DSM_SUPPORTED_FUNCTIONS , &result);if (ret <0 )return false;
drivers/gpu/drm/nouveau/nouveau_bios.c +17 -11
@@ -4447,7 +4447,8 @@ static int parse_bit_display_tbl_entry(struct drm_device *dev, struct nvbios *bireturn 0 ; } -static int parse_bit_init_tbl_entry (struct drm_device *dev,struct nvbios *bios,struct bit_entry *bitentry) +static int parse_bit_init_tbl_entry (struct drm_device *dev, +struct nvbios *bios,struct bit_entry *bitentry) {/* * Parses the init table segment that the bit entry points to.
@@ -4470,7 +4471,8 @@ static int parse_bit_init_tbl_entry(struct drm_device *dev, struct nvbios *bios,return 0 ; } -static int parse_bit_i_tbl_entry (struct drm_device *dev,struct nvbios *bios,struct bit_entry *bitentry) +static int parse_bit_i_tbl_entry (struct drm_device *dev, +struct nvbios *bios,struct bit_entry *bitentry) {/* * BIT 'i' (info?) table
@@ -4533,7 +4535,8 @@ static int parse_bit_i_tbl_entry(struct drm_device *dev, struct nvbios *bios, streturn 0 ; } -static int parse_bit_lvds_tbl_entry (struct drm_device *dev,struct nvbios *bios,struct bit_entry *bitentry) +static int parse_bit_lvds_tbl_entry (struct drm_device *dev, +struct nvbios *bios,struct bit_entry *bitentry) {/* * Parses the LVDS table segment that the bit entry points to.
@@ -4562,9 +4565,9 @@ parse_bit_M_tbl_entry(struct drm_device *dev, struct nvbios *bios, {/* * offset + 2 (8 bits): number of options in an -* INIT_RAM_RESTRICT_ZM_REG_GROUP opcode option set +* INIT_RAM_RESTRICT_ZM_REG_GROUP opcode option set * offset + 3 (16 bits): pointer to strap xlate table for RAM -* restrict option selection +* restrict option selection * * There's a bunch of bits in this table other than the RAM restrict * stuff that we don't use - their use currently unknown
@@ -4588,7 +4591,8 @@ parse_bit_M_tbl_entry(struct drm_device *dev, struct nvbios *bios,return 0 ; } -static int parse_bit_tmds_tbl_entry (struct drm_device *dev,struct nvbios *bios,struct bit_entry *bitentry) +static int parse_bit_tmds_tbl_entry (struct drm_device *dev, +struct nvbios *bios,struct bit_entry *bitentry) {/* * Parses the pointer to the TMDS table
@@ -4747,7 +4751,8 @@ parse_bit_structure(struct nvbios *bios, const uint16_t bitoffset)return 0 ; } -static int parse_bmp_structure (struct drm_device *dev,struct nvbios *bios,unsigned int offset) +static int parse_bmp_structure (struct drm_device *dev, +struct nvbios *bios,unsigned int offset) {/* * Parses the BMP structure for useful things, but does not act on them
@@ -4963,7 +4968,8 @@ static uint16_t findstr(uint8_t *data, int n, const uint8_t *str, int len) }static int -read_dcb_i2c_entry (struct drm_device *dev,int dcb_version,uint8_t *i2ctable,int index,struct dcb_i2c_entry *i2c) +read_dcb_i2c_entry (struct drm_device *dev,int dcb_version, +uint8_t *i2ctable,int index,struct dcb_i2c_entry *i2c) {uint8_t dcb_i2c_ver = dcb_version, headerlen =0 , entry_len =4 ;int i2c_entries =DCB_MAX_NUM_I2C_ENTRIES ;
@@ -5203,9 +5209,8 @@ divine_connector_type(struct nvbios *bios, int index)if (encoders & (1 <<OUTPUT_LVDS )) { type =DCB_CONNECTOR_LVDS ; }else -if (encoders & (1 <<OUTPUT_TV )) { +if (encoders & (1 <<OUTPUT_TV )) type =DCB_CONNECTOR_TV_0 ; - }return type; }
@@ -5818,7 +5823,8 @@ fixup_legacy_i2c(struct nvbios *bios) } } -static int load_nv17_hwsq_ucode_entry (struct drm_device *dev,struct nvbios *bios,uint16_t hwsq_offset,int entry) +static int load_nv17_hwsq_ucode_entry (struct drm_device *dev, +struct nvbios *bios,uint16_t hwsq_offset,int entry) {/* * The header following the "HWSQ" signature has the number of entries,
drivers/gpu/drm/nouveau/nouveau_gem.c +1 -1
@@ -717,7 +717,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, out:validate_fini (&op, fence); -nouveau_fence_unref ((void **)&fence); +nouveau_fence_unref ((void **)&fence);mutex_unlock (&dev->struct_mutex);kfree (bo);kfree (push);
drivers/gpu/drm/nouveau/nouveau_grctx.h +5 -5
@@ -87,10 +87,10 @@ _cp_bra(struct nouveau_grctx *ctx, u32 mod, int flag, int state, int name)cp_out (ctx,CP_BRA | (mod <<18 ) | ip | flag | (state ?0 :CP_BRA_IF_CLEAR )); } -#define cp_bra (c,f,s,n) _cp_bra((c), 0, CP_FLAG_##f, CP_FLAG_##f##_##s, n) +#define cp_bra (c, f, s, n) _cp_bra((c), 0, CP_FLAG_##f, CP_FLAG_##f##_##s, n)#ifdef CP_BRA_MOD -#define cp_cal (c,f,s,n) _cp_bra((c), 1, CP_FLAG_##f, CP_FLAG_##f##_##s, n) -#define cp_ret (c,f,s) _cp_bra((c), 2, CP_FLAG_##f, CP_FLAG_##f##_##s, 0) +#define cp_cal (c, f, s, n) _cp_bra((c), 1, CP_FLAG_##f, CP_FLAG_##f##_##s, n) +#define cp_ret (c, f, s) _cp_bra((c), 2, CP_FLAG_##f, CP_FLAG_##f##_##s, 0)#endif static inline void
@@ -98,14 +98,14 @@ _cp_wait(struct nouveau_grctx *ctx, int flag, int state) {cp_out (ctx,CP_WAIT | flag | (state ?CP_WAIT_SET :0 )); } -#define cp_wait (c,f,s) _cp_wait((c), CP_FLAG_##f, CP_FLAG_##f##_##s) +#define cp_wait (c, f, s) _cp_wait((c), CP_FLAG_##f, CP_FLAG_##f##_##s)static inline void _cp_set (struct nouveau_grctx *ctx,int flag,int state) {cp_out (ctx,CP_SET | flag | (state ?CP_SET_1 :0 )); } -#define cp_set (c,f,s) _cp_set((c), CP_FLAG_##f, CP_FLAG_##f##_##s) +#define cp_set (c, f, s) _cp_set((c), CP_FLAG_##f, CP_FLAG_##f##_##s)static inline void cp_pos (struct nouveau_grctx *ctx,int offset)
drivers/gpu/drm/nouveau/nouveau_hw.h +1 -1
@@ -211,7 +211,7 @@ static inline uint8_t NVReadVgaCrtc(struct drm_device *dev,* 0x03 bit0 set for dual link (LVDS, possibly elsewhere too) * 0x08 or 0x09 pxclk in MHz * 0x0f laptop panel info - low nibble for PEXTDEV_BOOT_0 strap -* high nibble for xlat strap value +* high nibble for xlat strap value */ static inline void
drivers/gpu/drm/nouveau/nouveau_reg.h +6 -6
@@ -617,9 +617,9 @@# define NV50_PCONNECTOR_I2C_PORT_4 0x0000e240# define NV50_PCONNECTOR_I2C_PORT_5 0x0000e258 -#define NV50_AUXCH_DATA_OUT (i,n) ((n) * 4 + (i) * 0x50 + 0x0000e4c0) +#define NV50_AUXCH_DATA_OUT (i, n) ((n) * 4 + (i) * 0x50 + 0x0000e4c0)#define NV50_AUXCH_DATA_OUT__SIZE 4 -#define NV50_AUXCH_DATA_IN (i,n) ((n) * 4 + (i) * 0x50 + 0x0000e4d0) +#define NV50_AUXCH_DATA_IN (i, n) ((n) * 4 + (i) * 0x50 + 0x0000e4d0)#define NV50_AUXCH_DATA_IN__SIZE 4#define NV50_AUXCH_ADDR (i) ((i) * 0x50 + 0x0000e4e0)#define NV50_AUXCH_CTRL (i) ((i) * 0x50 + 0x0000e4e4)
@@ -813,7 +813,7 @@#define NV50_PDISPLAY_SOR_BACKLIGHT 0x0061c084#define NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE 0x80000000#define NV50_PDISPLAY_SOR_BACKLIGHT_LEVEL 0x00000fff -#define NV50_SOR_DP_CTRL (i,l) (0x0061c10c + (i) * 0x800 + (l) * 0x80) +#define NV50_SOR_DP_CTRL (i, l) (0x0061c10c + (i) * 0x800 + (l) * 0x80)#define NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED 0x00004000#define NV50_SOR_DP_CTRL_LANE_MASK 0x001f0000#define NV50_SOR_DP_CTRL_LANE_0_ENABLED 0x00010000
@@ -824,9 +824,9 @@#define NV50_SOR_DP_CTRL_TRAINING_PATTERN_DISABLED 0x00000000#define NV50_SOR_DP_CTRL_TRAINING_PATTERN_1 0x01000000#define NV50_SOR_DP_CTRL_TRAINING_PATTERN_2 0x02000000 -#define NV50_SOR_DP_UNK118 (i,l) (0x0061c118 + (i) * 0x800 + (l) * 0x80) -#define NV50_SOR_DP_UNK120 (i,l) (0x0061c120 + (i) * 0x800 + (l) * 0x80) -#define NV50_SOR_DP_UNK130 (i,l) (0x0061c130 + (i) * 0x800 + (l) * 0x80) +#define NV50_SOR_DP_UNK118 (i, l) (0x0061c118 + (i) * 0x800 + (l) * 0x80) +#define NV50_SOR_DP_UNK120 (i, l) (0x0061c120 + (i) * 0x800 + (l) * 0x80) +#define NV50_SOR_DP_UNK130 (i, l) (0x0061c130 + (i) * 0x800 + (l) * 0x80)#define NV50_PDISPLAY_USER (i) ((i) * 0x1000 + 0x00640000)#define NV50_PDISPLAY_USER_PUT (i) ((i) * 0x1000 + 0x00640000)
Signature · 1 line
1.6.4