@@ -313,12 +313,11 @@ static int sst_add_perf_profiles(struct auxiliary_device *auxdev,
313
313
struct tpmi_per_power_domain_info * pd_info ,
314
314
int levels )
315
315
{
316
+ struct device * dev = & auxdev -> dev ;
316
317
u64 perf_level_offsets ;
317
318
int i ;
318
319
319
- pd_info -> perf_levels = devm_kcalloc (& auxdev -> dev , levels ,
320
- sizeof (struct perf_level ),
321
- GFP_KERNEL );
320
+ pd_info -> perf_levels = devm_kcalloc (dev , levels , sizeof (struct perf_level ), GFP_KERNEL );
322
321
if (!pd_info -> perf_levels )
323
322
return 0 ;
324
323
@@ -349,6 +348,7 @@ static int sst_add_perf_profiles(struct auxiliary_device *auxdev,
349
348
350
349
static int sst_main (struct auxiliary_device * auxdev , struct tpmi_per_power_domain_info * pd_info )
351
350
{
351
+ struct device * dev = & auxdev -> dev ;
352
352
int i , mask , levels ;
353
353
354
354
* ((u64 * )& pd_info -> sst_header ) = readq (pd_info -> sst_base );
@@ -359,13 +359,13 @@ static int sst_main(struct auxiliary_device *auxdev, struct tpmi_per_power_domai
359
359
return - ENODEV ;
360
360
361
361
if (TPMI_MAJOR_VERSION (pd_info -> sst_header .interface_version ) != ISST_MAJOR_VERSION ) {
362
- dev_err (& auxdev -> dev , "SST: Unsupported major version:%lx\n" ,
362
+ dev_err (dev , "SST: Unsupported major version:%lx\n" ,
363
363
TPMI_MAJOR_VERSION (pd_info -> sst_header .interface_version ));
364
364
return - ENODEV ;
365
365
}
366
366
367
367
if (TPMI_MINOR_VERSION (pd_info -> sst_header .interface_version ) != ISST_MINOR_VERSION )
368
- dev_info (& auxdev -> dev , "SST: Ignore: Unsupported minor version:%lx\n" ,
368
+ dev_info (dev , "SST: Ignore: Unsupported minor version:%lx\n" ,
369
369
TPMI_MINOR_VERSION (pd_info -> sst_header .interface_version ));
370
370
371
371
/* Read SST CP Header */
@@ -1273,28 +1273,29 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
1273
1273
{
1274
1274
bool read_blocked = 0 , write_blocked = 0 ;
1275
1275
struct intel_tpmi_plat_info * plat_info ;
1276
+ struct device * dev = & auxdev -> dev ;
1276
1277
struct tpmi_sst_struct * tpmi_sst ;
1277
1278
int i , ret , pkg = 0 , inst = 0 ;
1278
1279
int num_resources ;
1279
1280
1280
1281
ret = tpmi_get_feature_status (auxdev , TPMI_ID_SST , & read_blocked , & write_blocked );
1281
1282
if (ret )
1282
- dev_info (& auxdev -> dev , "Can't read feature status: ignoring read/write blocked status\n" );
1283
+ dev_info (dev , "Can't read feature status: ignoring read/write blocked status\n" );
1283
1284
1284
1285
if (read_blocked ) {
1285
- dev_info (& auxdev -> dev , "Firmware has blocked reads, exiting\n" );
1286
+ dev_info (dev , "Firmware has blocked reads, exiting\n" );
1286
1287
return - ENODEV ;
1287
1288
}
1288
1289
1289
1290
plat_info = tpmi_get_platform_data (auxdev );
1290
1291
if (!plat_info ) {
1291
- dev_err (& auxdev -> dev , "No platform info\n" );
1292
+ dev_err (dev , "No platform info\n" );
1292
1293
return - EINVAL ;
1293
1294
}
1294
1295
1295
1296
pkg = plat_info -> package_id ;
1296
1297
if (pkg >= topology_max_packages ()) {
1297
- dev_err (& auxdev -> dev , "Invalid package id :%x\n" , pkg );
1298
+ dev_err (dev , "Invalid package id :%x\n" , pkg );
1298
1299
return - EINVAL ;
1299
1300
}
1300
1301
@@ -1306,11 +1307,11 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
1306
1307
if (!num_resources )
1307
1308
return - EINVAL ;
1308
1309
1309
- tpmi_sst = devm_kzalloc (& auxdev -> dev , sizeof (* tpmi_sst ), GFP_KERNEL );
1310
+ tpmi_sst = devm_kzalloc (dev , sizeof (* tpmi_sst ), GFP_KERNEL );
1310
1311
if (!tpmi_sst )
1311
1312
return - ENOMEM ;
1312
1313
1313
- tpmi_sst -> power_domain_info = devm_kcalloc (& auxdev -> dev , num_resources ,
1314
+ tpmi_sst -> power_domain_info = devm_kcalloc (dev , num_resources ,
1314
1315
sizeof (* tpmi_sst -> power_domain_info ),
1315
1316
GFP_KERNEL );
1316
1317
if (!tpmi_sst -> power_domain_info )
@@ -1331,13 +1332,13 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
1331
1332
tpmi_sst -> power_domain_info [i ].power_domain_id = i ;
1332
1333
tpmi_sst -> power_domain_info [i ].auxdev = auxdev ;
1333
1334
tpmi_sst -> power_domain_info [i ].write_blocked = write_blocked ;
1334
- tpmi_sst -> power_domain_info [i ].sst_base = devm_ioremap_resource (& auxdev -> dev , res );
1335
+ tpmi_sst -> power_domain_info [i ].sst_base = devm_ioremap_resource (dev , res );
1335
1336
if (IS_ERR (tpmi_sst -> power_domain_info [i ].sst_base ))
1336
1337
return PTR_ERR (tpmi_sst -> power_domain_info [i ].sst_base );
1337
1338
1338
1339
ret = sst_main (auxdev , & tpmi_sst -> power_domain_info [i ]);
1339
1340
if (ret ) {
1340
- devm_iounmap (& auxdev -> dev , tpmi_sst -> power_domain_info [i ].sst_base );
1341
+ devm_iounmap (dev , tpmi_sst -> power_domain_info [i ].sst_base );
1341
1342
tpmi_sst -> power_domain_info [i ].sst_base = NULL ;
1342
1343
continue ;
1343
1344
}
0 commit comments