Skip to content

Commit 6c9bd44

Browse files
GregWills97Thomas Zimmermann
authored andcommitted
DRM: ast: Fixed coding style issues of ast_mode.c
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 <[email protected]> Signed-off-by: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20210731005328.GA19016@devbox
1 parent 9746f5f commit 6c9bd44

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

drivers/gpu/drm/ast/ast_mode.c

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static void ast_set_std_reg(struct ast_private *ast,
275275
ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x01, 0xdf, stdtable->seq[0]);
276276
for (i = 1; i < 4; i++) {
277277
jreg = stdtable->seq[i];
278-
ast_set_index_reg(ast, AST_IO_SEQ_PORT, (i + 1) , jreg);
278+
ast_set_index_reg(ast, AST_IO_SEQ_PORT, (i + 1), jreg);
279279
}
280280

281281
/* Set CRTC; except base address and offset */
@@ -498,13 +498,15 @@ static void ast_set_sync_reg(struct ast_private *ast,
498498

499499
jreg = ast_io_read8(ast, AST_IO_MISC_PORT_READ);
500500
jreg &= ~0xC0;
501-
if (vbios_mode->enh_table->flags & NVSync) jreg |= 0x80;
502-
if (vbios_mode->enh_table->flags & NHSync) jreg |= 0x40;
501+
if (vbios_mode->enh_table->flags & NVSync)
502+
jreg |= 0x80;
503+
if (vbios_mode->enh_table->flags & NHSync)
504+
jreg |= 0x40;
503505
ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);
504506
}
505507

506508
static void ast_set_start_address_crt1(struct ast_private *ast,
507-
unsigned offset)
509+
unsigned int offset)
508510
{
509511
u32 addr;
510512

@@ -1211,6 +1213,7 @@ static int ast_get_modes(struct drm_connector *connector)
12111213
struct edid *edid;
12121214
int ret;
12131215
bool flags = false;
1216+
12141217
if (ast->tx_chip_type == AST_TX_DP501) {
12151218
ast->dp501_maxclk = 0xff;
12161219
edid = kmalloc(128, GFP_KERNEL);
@@ -1230,8 +1233,8 @@ static int ast_get_modes(struct drm_connector *connector)
12301233
ret = drm_add_edid_modes(connector, edid);
12311234
kfree(edid);
12321235
return ret;
1233-
} else
1234-
drm_connector_update_edid_property(&ast_connector->base, NULL);
1236+
}
1237+
drm_connector_update_edid_property(&ast_connector->base, NULL);
12351238
return 0;
12361239
}
12371240

@@ -1271,19 +1274,24 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector,
12711274
}
12721275
switch (mode->hdisplay) {
12731276
case 640:
1274-
if (mode->vdisplay == 480) flags = MODE_OK;
1277+
if (mode->vdisplay == 480)
1278+
flags = MODE_OK;
12751279
break;
12761280
case 800:
1277-
if (mode->vdisplay == 600) flags = MODE_OK;
1281+
if (mode->vdisplay == 600)
1282+
flags = MODE_OK;
12781283
break;
12791284
case 1024:
1280-
if (mode->vdisplay == 768) flags = MODE_OK;
1285+
if (mode->vdisplay == 768)
1286+
flags = MODE_OK;
12811287
break;
12821288
case 1280:
1283-
if (mode->vdisplay == 1024) flags = MODE_OK;
1289+
if (mode->vdisplay == 1024)
1290+
flags = MODE_OK;
12841291
break;
12851292
case 1600:
1286-
if (mode->vdisplay == 1200) flags = MODE_OK;
1293+
if (mode->vdisplay == 1200)
1294+
flags = MODE_OK;
12871295
break;
12881296
default:
12891297
return flags;
@@ -1307,6 +1315,7 @@ static enum drm_connector_status ast_connector_detect(struct drm_connector
13071315
static void ast_connector_destroy(struct drm_connector *connector)
13081316
{
13091317
struct ast_connector *ast_connector = to_ast_connector(connector);
1318+
13101319
ast_i2c_destroy(ast_connector->i2c);
13111320
drm_connector_cleanup(connector);
13121321
}

0 commit comments

Comments
 (0)