[PATCH] DRM: ast: Fixed coding style issues of ast_mode.c

Thomas Zimmermann tzimmermann at suse.de
Sun Aug 1 13:14:08 UTC 2021


Hi

Am 31.07.21 um 02:53 schrieb Gregory Williams:
> Removed space before comma, fixed if statements by putting trailing
> statements on new line, fixed unsigned int declaration, and removed
> not needed else statement after return.
> 
> Signed-off-by: Gregory Williams <gregwills85 at gmail.com>

Added to drm-misc-next. Thanks for the patch.

Best regards
Thomas

> ---
>   drivers/gpu/drm/ast/ast_mode.c | 31 ++++++++++++++++++++-----------
>   1 file changed, 20 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 36d9575aa27b..1310ed092073 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -275,7 +275,7 @@ static void ast_set_std_reg(struct ast_private *ast,
>   	ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x01, 0xdf, stdtable->seq[0]);
>   	for (i = 1; i < 4; i++) {
>   		jreg = stdtable->seq[i];
> -		ast_set_index_reg(ast, AST_IO_SEQ_PORT, (i + 1) , jreg);
> +		ast_set_index_reg(ast, AST_IO_SEQ_PORT, (i + 1), jreg);
>   	}
>   
>   	/* Set CRTC; except base address and offset */
> @@ -498,13 +498,15 @@ static void ast_set_sync_reg(struct ast_private *ast,
>   
>   	jreg  = ast_io_read8(ast, AST_IO_MISC_PORT_READ);
>   	jreg &= ~0xC0;
> -	if (vbios_mode->enh_table->flags & NVSync) jreg |= 0x80;
> -	if (vbios_mode->enh_table->flags & NHSync) jreg |= 0x40;
> +	if (vbios_mode->enh_table->flags & NVSync)
> +		jreg |= 0x80;
> +	if (vbios_mode->enh_table->flags & NHSync)
> +		jreg |= 0x40;
>   	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);
>   }
>   
>   static void ast_set_start_address_crt1(struct ast_private *ast,
> -				       unsigned offset)
> +				       unsigned int offset)
>   {
>   	u32 addr;
>   
> @@ -1212,6 +1214,7 @@ static int ast_get_modes(struct drm_connector *connector)
>   	struct edid *edid;
>   	int ret;
>   	bool flags = false;
> +
>   	if (ast->tx_chip_type == AST_TX_DP501) {
>   		ast->dp501_maxclk = 0xff;
>   		edid = kmalloc(128, GFP_KERNEL);
> @@ -1231,8 +1234,8 @@ static int ast_get_modes(struct drm_connector *connector)
>   		ret = drm_add_edid_modes(connector, edid);
>   		kfree(edid);
>   		return ret;
> -	} else
> -		drm_connector_update_edid_property(&ast_connector->base, NULL);
> +	}
> +	drm_connector_update_edid_property(&ast_connector->base, NULL);
>   	return 0;
>   }
>   
> @@ -1272,19 +1275,24 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector,
>   	}
>   	switch (mode->hdisplay) {
>   	case 640:
> -		if (mode->vdisplay == 480) flags = MODE_OK;
> +		if (mode->vdisplay == 480)
> +			flags = MODE_OK;
>   		break;
>   	case 800:
> -		if (mode->vdisplay == 600) flags = MODE_OK;
> +		if (mode->vdisplay == 600)
> +			flags = MODE_OK;
>   		break;
>   	case 1024:
> -		if (mode->vdisplay == 768) flags = MODE_OK;
> +		if (mode->vdisplay == 768)
> +			flags = MODE_OK;
>   		break;
>   	case 1280:
> -		if (mode->vdisplay == 1024) flags = MODE_OK;
> +		if (mode->vdisplay == 1024)
> +			flags = MODE_OK;
>   		break;
>   	case 1600:
> -		if (mode->vdisplay == 1200) flags = MODE_OK;
> +		if (mode->vdisplay == 1200)
> +			flags = MODE_OK;
>   		break;
>   	default:
>   		return flags;
> @@ -1296,6 +1304,7 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector,
>   static void ast_connector_destroy(struct drm_connector *connector)
>   {
>   	struct ast_connector *ast_connector = to_ast_connector(connector);
> +
>   	ast_i2c_destroy(ast_connector->i2c);
>   	drm_connector_cleanup(connector);
>   }
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210801/6d26e688/attachment.sig>


More information about the dri-devel mailing list