@@ -275,7 +275,7 @@ static void ast_set_std_reg(struct ast_private *ast,
275
275
ast_set_index_reg_mask (ast , AST_IO_SEQ_PORT , 0x01 , 0xdf , stdtable -> seq [0 ]);
276
276
for (i = 1 ; i < 4 ; i ++ ) {
277
277
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 );
279
279
}
280
280
281
281
/* Set CRTC; except base address and offset */
@@ -498,13 +498,15 @@ static void ast_set_sync_reg(struct ast_private *ast,
498
498
499
499
jreg = ast_io_read8 (ast , AST_IO_MISC_PORT_READ );
500
500
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 ;
503
505
ast_io_write8 (ast , AST_IO_MISC_PORT_WRITE , jreg );
504
506
}
505
507
506
508
static void ast_set_start_address_crt1 (struct ast_private * ast ,
507
- unsigned offset )
509
+ unsigned int offset )
508
510
{
509
511
u32 addr ;
510
512
@@ -1211,6 +1213,7 @@ static int ast_get_modes(struct drm_connector *connector)
1211
1213
struct edid * edid ;
1212
1214
int ret ;
1213
1215
bool flags = false;
1216
+
1214
1217
if (ast -> tx_chip_type == AST_TX_DP501 ) {
1215
1218
ast -> dp501_maxclk = 0xff ;
1216
1219
edid = kmalloc (128 , GFP_KERNEL );
@@ -1230,8 +1233,8 @@ static int ast_get_modes(struct drm_connector *connector)
1230
1233
ret = drm_add_edid_modes (connector , edid );
1231
1234
kfree (edid );
1232
1235
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 );
1235
1238
return 0 ;
1236
1239
}
1237
1240
@@ -1271,19 +1274,24 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector,
1271
1274
}
1272
1275
switch (mode -> hdisplay ) {
1273
1276
case 640 :
1274
- if (mode -> vdisplay == 480 ) flags = MODE_OK ;
1277
+ if (mode -> vdisplay == 480 )
1278
+ flags = MODE_OK ;
1275
1279
break ;
1276
1280
case 800 :
1277
- if (mode -> vdisplay == 600 ) flags = MODE_OK ;
1281
+ if (mode -> vdisplay == 600 )
1282
+ flags = MODE_OK ;
1278
1283
break ;
1279
1284
case 1024 :
1280
- if (mode -> vdisplay == 768 ) flags = MODE_OK ;
1285
+ if (mode -> vdisplay == 768 )
1286
+ flags = MODE_OK ;
1281
1287
break ;
1282
1288
case 1280 :
1283
- if (mode -> vdisplay == 1024 ) flags = MODE_OK ;
1289
+ if (mode -> vdisplay == 1024 )
1290
+ flags = MODE_OK ;
1284
1291
break ;
1285
1292
case 1600 :
1286
- if (mode -> vdisplay == 1200 ) flags = MODE_OK ;
1293
+ if (mode -> vdisplay == 1200 )
1294
+ flags = MODE_OK ;
1287
1295
break ;
1288
1296
default :
1289
1297
return flags ;
@@ -1307,6 +1315,7 @@ static enum drm_connector_status ast_connector_detect(struct drm_connector
1307
1315
static void ast_connector_destroy (struct drm_connector * connector )
1308
1316
{
1309
1317
struct ast_connector * ast_connector = to_ast_connector (connector );
1318
+
1310
1319
ast_i2c_destroy (ast_connector -> i2c );
1311
1320
drm_connector_cleanup (connector );
1312
1321
}
0 commit comments