Skip to content

Commit 6625a05

Browse files
groeckgroeck
committed
hwmon: (pmbus/core) Use local debugfs variable in debugfs initialization
In preparation for the next patch in the series, use a local debugfs variable during debugfs initialization. No functional change intended. Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 649b419 commit 6625a05

1 file changed

Lines changed: 25 additions & 24 deletions

File tree

‎drivers/hwmon/pmbus/pmbus_core.c‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3506,6 +3506,7 @@ static void pmbus_remove_debugfs(void *data)
35063506
static int pmbus_init_debugfs(struct i2c_client *client,
35073507
struct pmbus_data *data)
35083508
{
3509+
struct dentry *debugfs;
35093510
int i, idx = 0;
35103511
char name[PMBUS_NAME_SIZE];
35113512
struct pmbus_debugfs_entry *entries;
@@ -3517,12 +3518,12 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35173518
* Create the debugfs directory for this device. Use the hwmon device
35183519
* name to avoid conflicts (hwmon numbers are globally unique).
35193520
*/
3520-
data->debugfs = debugfs_create_dir(dev_name(data->hwmon_dev),
3521-
pmbus_debugfs_dir);
3522-
if (IS_ERR_OR_NULL(data->debugfs)) {
3523-
data->debugfs = NULL;
3521+
debugfs = debugfs_create_dir(dev_name(data->hwmon_dev),
3522+
pmbus_debugfs_dir);
3523+
if (IS_ERR_OR_NULL(debugfs))
35243524
return -ENODEV;
3525-
}
3525+
3526+
data->debugfs = debugfs;
35263527

35273528
/*
35283529
* Allocate the max possible entries we need.
@@ -3547,7 +3548,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35473548
entries[idx].client = client;
35483549
entries[idx].page = 0;
35493550
entries[idx].reg = PMBUS_REVISION;
3550-
debugfs_create_file("revision", 0444, data->debugfs,
3551+
debugfs_create_file("revision", 0444, debugfs,
35513552
&entries[idx++],
35523553
&pmbus_debugfs_ops);
35533554
}
@@ -3556,7 +3557,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35563557
entries[idx].client = client;
35573558
entries[idx].page = 0;
35583559
entries[idx].reg = PMBUS_MFR_ID;
3559-
debugfs_create_file("mfr_id", 0444, data->debugfs,
3560+
debugfs_create_file("mfr_id", 0444, debugfs,
35603561
&entries[idx++],
35613562
&pmbus_debugfs_ops_mfr);
35623563
}
@@ -3565,7 +3566,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35653566
entries[idx].client = client;
35663567
entries[idx].page = 0;
35673568
entries[idx].reg = PMBUS_MFR_MODEL;
3568-
debugfs_create_file("mfr_model", 0444, data->debugfs,
3569+
debugfs_create_file("mfr_model", 0444, debugfs,
35693570
&entries[idx++],
35703571
&pmbus_debugfs_ops_mfr);
35713572
}
@@ -3574,7 +3575,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35743575
entries[idx].client = client;
35753576
entries[idx].page = 0;
35763577
entries[idx].reg = PMBUS_MFR_REVISION;
3577-
debugfs_create_file("mfr_revision", 0444, data->debugfs,
3578+
debugfs_create_file("mfr_revision", 0444, debugfs,
35783579
&entries[idx++],
35793580
&pmbus_debugfs_ops_mfr);
35803581
}
@@ -3583,7 +3584,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35833584
entries[idx].client = client;
35843585
entries[idx].page = 0;
35853586
entries[idx].reg = PMBUS_MFR_LOCATION;
3586-
debugfs_create_file("mfr_location", 0444, data->debugfs,
3587+
debugfs_create_file("mfr_location", 0444, debugfs,
35873588
&entries[idx++],
35883589
&pmbus_debugfs_ops_mfr);
35893590
}
@@ -3592,7 +3593,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
35923593
entries[idx].client = client;
35933594
entries[idx].page = 0;
35943595
entries[idx].reg = PMBUS_MFR_DATE;
3595-
debugfs_create_file("mfr_date", 0444, data->debugfs,
3596+
debugfs_create_file("mfr_date", 0444, debugfs,
35963597
&entries[idx++],
35973598
&pmbus_debugfs_ops_mfr);
35983599
}
@@ -3601,7 +3602,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36013602
entries[idx].client = client;
36023603
entries[idx].page = 0;
36033604
entries[idx].reg = PMBUS_MFR_SERIAL;
3604-
debugfs_create_file("mfr_serial", 0444, data->debugfs,
3605+
debugfs_create_file("mfr_serial", 0444, debugfs,
36053606
&entries[idx++],
36063607
&pmbus_debugfs_ops_mfr);
36073608
}
@@ -3614,7 +3615,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36143615
entries[idx].client = client;
36153616
entries[idx].page = i;
36163617
scnprintf(name, PMBUS_NAME_SIZE, "status%d", i);
3617-
debugfs_create_file(name, 0444, data->debugfs,
3618+
debugfs_create_file(name, 0444, debugfs,
36183619
&entries[idx++],
36193620
&pmbus_debugfs_ops_status);
36203621
}
@@ -3624,7 +3625,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36243625
entries[idx].page = i;
36253626
entries[idx].reg = PMBUS_STATUS_VOUT;
36263627
scnprintf(name, PMBUS_NAME_SIZE, "status%d_vout", i);
3627-
debugfs_create_file(name, 0444, data->debugfs,
3628+
debugfs_create_file(name, 0444, debugfs,
36283629
&entries[idx++],
36293630
&pmbus_debugfs_ops);
36303631
}
@@ -3634,7 +3635,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36343635
entries[idx].page = i;
36353636
entries[idx].reg = PMBUS_STATUS_IOUT;
36363637
scnprintf(name, PMBUS_NAME_SIZE, "status%d_iout", i);
3637-
debugfs_create_file(name, 0444, data->debugfs,
3638+
debugfs_create_file(name, 0444, debugfs,
36383639
&entries[idx++],
36393640
&pmbus_debugfs_ops);
36403641
}
@@ -3644,7 +3645,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36443645
entries[idx].page = i;
36453646
entries[idx].reg = PMBUS_STATUS_INPUT;
36463647
scnprintf(name, PMBUS_NAME_SIZE, "status%d_input", i);
3647-
debugfs_create_file(name, 0444, data->debugfs,
3648+
debugfs_create_file(name, 0444, debugfs,
36483649
&entries[idx++],
36493650
&pmbus_debugfs_ops);
36503651
}
@@ -3654,7 +3655,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36543655
entries[idx].page = i;
36553656
entries[idx].reg = PMBUS_STATUS_TEMPERATURE;
36563657
scnprintf(name, PMBUS_NAME_SIZE, "status%d_temp", i);
3657-
debugfs_create_file(name, 0444, data->debugfs,
3658+
debugfs_create_file(name, 0444, debugfs,
36583659
&entries[idx++],
36593660
&pmbus_debugfs_ops);
36603661
}
@@ -3664,7 +3665,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36643665
entries[idx].page = i;
36653666
entries[idx].reg = PMBUS_STATUS_CML;
36663667
scnprintf(name, PMBUS_NAME_SIZE, "status%d_cml", i);
3667-
debugfs_create_file(name, 0444, data->debugfs,
3668+
debugfs_create_file(name, 0444, debugfs,
36683669
&entries[idx++],
36693670
&pmbus_debugfs_ops);
36703671
}
@@ -3674,7 +3675,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36743675
entries[idx].page = i;
36753676
entries[idx].reg = PMBUS_STATUS_OTHER;
36763677
scnprintf(name, PMBUS_NAME_SIZE, "status%d_other", i);
3677-
debugfs_create_file(name, 0444, data->debugfs,
3678+
debugfs_create_file(name, 0444, debugfs,
36783679
&entries[idx++],
36793680
&pmbus_debugfs_ops);
36803681
}
@@ -3685,7 +3686,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36853686
entries[idx].page = i;
36863687
entries[idx].reg = PMBUS_STATUS_MFR_SPECIFIC;
36873688
scnprintf(name, PMBUS_NAME_SIZE, "status%d_mfr", i);
3688-
debugfs_create_file(name, 0444, data->debugfs,
3689+
debugfs_create_file(name, 0444, debugfs,
36893690
&entries[idx++],
36903691
&pmbus_debugfs_ops);
36913692
}
@@ -3695,7 +3696,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
36953696
entries[idx].page = i;
36963697
entries[idx].reg = PMBUS_STATUS_FAN_12;
36973698
scnprintf(name, PMBUS_NAME_SIZE, "status%d_fan12", i);
3698-
debugfs_create_file(name, 0444, data->debugfs,
3699+
debugfs_create_file(name, 0444, debugfs,
36993700
&entries[idx++],
37003701
&pmbus_debugfs_ops);
37013702
}
@@ -3705,14 +3706,14 @@ static int pmbus_init_debugfs(struct i2c_client *client,
37053706
entries[idx].page = i;
37063707
entries[idx].reg = PMBUS_STATUS_FAN_34;
37073708
scnprintf(name, PMBUS_NAME_SIZE, "status%d_fan34", i);
3708-
debugfs_create_file(name, 0444, data->debugfs,
3709+
debugfs_create_file(name, 0444, debugfs,
37093710
&entries[idx++],
37103711
&pmbus_debugfs_ops);
37113712
}
37123713
}
37133714

3714-
return devm_add_action_or_reset(data->dev,
3715-
pmbus_remove_debugfs, data->debugfs);
3715+
return devm_add_action_or_reset(data->dev, pmbus_remove_debugfs,
3716+
debugfs);
37163717
}
37173718
#else
37183719
static int pmbus_init_debugfs(struct i2c_client *client,

0 commit comments

Comments
 (0)