Skip to content

Commit bf14cd4

Browse files
XueBing Chenalexdeucher
authored andcommitted
drm/radeon/ni_dpm: Clean up errors in nislands_smc.h
Fix the following errors reported by checkpatch: ERROR: open brace '{' following struct go on the same line Signed-off-by: XueBing Chen <chenxb_99091@126.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent a87076d commit bf14cd4

File tree

1 file changed

+17
-34
lines changed

1 file changed

+17
-34
lines changed

drivers/gpu/drm/radeon/nislands_smc.h

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727

2828
#define NISLANDS_MAX_SMC_PERFORMANCE_LEVELS_PER_SWSTATE 16
2929

30-
struct PP_NIslands_Dpm2PerfLevel
31-
{
30+
struct PP_NIslands_Dpm2PerfLevel {
3231
uint8_t MaxPS;
3332
uint8_t TgtAct;
3433
uint8_t MaxPS_StepInc;
@@ -44,17 +43,15 @@ struct PP_NIslands_Dpm2PerfLevel
4443

4544
typedef struct PP_NIslands_Dpm2PerfLevel PP_NIslands_Dpm2PerfLevel;
4645

47-
struct PP_NIslands_DPM2Parameters
48-
{
46+
struct PP_NIslands_DPM2Parameters {
4947
uint32_t TDPLimit;
5048
uint32_t NearTDPLimit;
5149
uint32_t SafePowerLimit;
5250
uint32_t PowerBoostLimit;
5351
};
5452
typedef struct PP_NIslands_DPM2Parameters PP_NIslands_DPM2Parameters;
5553

56-
struct NISLANDS_SMC_SCLK_VALUE
57-
{
54+
struct NISLANDS_SMC_SCLK_VALUE {
5855
uint32_t vCG_SPLL_FUNC_CNTL;
5956
uint32_t vCG_SPLL_FUNC_CNTL_2;
6057
uint32_t vCG_SPLL_FUNC_CNTL_3;
@@ -66,8 +63,7 @@ struct NISLANDS_SMC_SCLK_VALUE
6663

6764
typedef struct NISLANDS_SMC_SCLK_VALUE NISLANDS_SMC_SCLK_VALUE;
6865

69-
struct NISLANDS_SMC_MCLK_VALUE
70-
{
66+
struct NISLANDS_SMC_MCLK_VALUE {
7167
uint32_t vMPLL_FUNC_CNTL;
7268
uint32_t vMPLL_FUNC_CNTL_1;
7369
uint32_t vMPLL_FUNC_CNTL_2;
@@ -84,17 +80,15 @@ struct NISLANDS_SMC_MCLK_VALUE
8480

8581
typedef struct NISLANDS_SMC_MCLK_VALUE NISLANDS_SMC_MCLK_VALUE;
8682

87-
struct NISLANDS_SMC_VOLTAGE_VALUE
88-
{
83+
struct NISLANDS_SMC_VOLTAGE_VALUE {
8984
uint16_t value;
9085
uint8_t index;
9186
uint8_t padding;
9287
};
9388

9489
typedef struct NISLANDS_SMC_VOLTAGE_VALUE NISLANDS_SMC_VOLTAGE_VALUE;
9590

96-
struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL
97-
{
91+
struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL {
9892
uint8_t arbValue;
9993
uint8_t ACIndex;
10094
uint8_t displayWatermark;
@@ -132,8 +126,7 @@ struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL
132126

133127
typedef struct NISLANDS_SMC_HW_PERFORMANCE_LEVEL NISLANDS_SMC_HW_PERFORMANCE_LEVEL;
134128

135-
struct NISLANDS_SMC_SWSTATE
136-
{
129+
struct NISLANDS_SMC_SWSTATE {
137130
uint8_t flags;
138131
uint8_t levelCount;
139132
uint8_t padding2;
@@ -156,8 +149,7 @@ struct NISLANDS_SMC_SWSTATE_SINGLE {
156149
#define NISLANDS_SMC_VOLTAGEMASK_VDDCI 2
157150
#define NISLANDS_SMC_VOLTAGEMASK_MAX 4
158151

159-
struct NISLANDS_SMC_VOLTAGEMASKTABLE
160-
{
152+
struct NISLANDS_SMC_VOLTAGEMASKTABLE {
161153
uint8_t highMask[NISLANDS_SMC_VOLTAGEMASK_MAX];
162154
uint32_t lowMask[NISLANDS_SMC_VOLTAGEMASK_MAX];
163155
};
@@ -166,8 +158,7 @@ typedef struct NISLANDS_SMC_VOLTAGEMASKTABLE NISLANDS_SMC_VOLTAGEMASKTABLE;
166158

167159
#define NISLANDS_MAX_NO_VREG_STEPS 32
168160

169-
struct NISLANDS_SMC_STATETABLE
170-
{
161+
struct NISLANDS_SMC_STATETABLE {
171162
uint8_t thermalProtectType;
172163
uint8_t systemFlags;
173164
uint8_t maxVDDCIndexInPPTable;
@@ -203,17 +194,15 @@ typedef struct NISLANDS_SMC_STATETABLE NISLANDS_SMC_STATETABLE;
203194
#define SMC_NISLANDS_LKGE_LUT_NUM_OF_VOLT_ENTRIES 16
204195
#define SMC_NISLANDS_BIF_LUT_NUM_OF_ENTRIES 4
205196

206-
struct SMC_NISLANDS_MC_TPP_CAC_TABLE
207-
{
197+
struct SMC_NISLANDS_MC_TPP_CAC_TABLE {
208198
uint32_t tpp[SMC_NISLANDS_MC_TPP_CAC_NUM_OF_ENTRIES];
209199
uint32_t cacValue[SMC_NISLANDS_MC_TPP_CAC_NUM_OF_ENTRIES];
210200
};
211201

212202
typedef struct SMC_NISLANDS_MC_TPP_CAC_TABLE SMC_NISLANDS_MC_TPP_CAC_TABLE;
213203

214204

215-
struct PP_NIslands_CACTABLES
216-
{
205+
struct PP_NIslands_CACTABLES {
217206
uint32_t cac_bif_lut[SMC_NISLANDS_BIF_LUT_NUM_OF_ENTRIES];
218207
uint32_t cac_lkge_lut[SMC_NISLANDS_LKGE_LUT_NUM_OF_TEMP_ENTRIES][SMC_NISLANDS_LKGE_LUT_NUM_OF_VOLT_ENTRIES];
219208

@@ -257,24 +246,21 @@ typedef struct PP_NIslands_CACTABLES PP_NIslands_CACTABLES;
257246
#define SMC_NISLANDS_MC_REGISTER_ARRAY_SIZE 32
258247
#define SMC_NISLANDS_MC_REGISTER_ARRAY_SET_COUNT 20
259248

260-
struct SMC_NIslands_MCRegisterAddress
261-
{
249+
struct SMC_NIslands_MCRegisterAddress {
262250
uint16_t s0;
263251
uint16_t s1;
264252
};
265253

266254
typedef struct SMC_NIslands_MCRegisterAddress SMC_NIslands_MCRegisterAddress;
267255

268256

269-
struct SMC_NIslands_MCRegisterSet
270-
{
257+
struct SMC_NIslands_MCRegisterSet {
271258
uint32_t value[SMC_NISLANDS_MC_REGISTER_ARRAY_SIZE];
272259
};
273260

274261
typedef struct SMC_NIslands_MCRegisterSet SMC_NIslands_MCRegisterSet;
275262

276-
struct SMC_NIslands_MCRegisters
277-
{
263+
struct SMC_NIslands_MCRegisters {
278264
uint8_t last;
279265
uint8_t reserved[3];
280266
SMC_NIslands_MCRegisterAddress address[SMC_NISLANDS_MC_REGISTER_ARRAY_SIZE];
@@ -283,8 +269,7 @@ struct SMC_NIslands_MCRegisters
283269

284270
typedef struct SMC_NIslands_MCRegisters SMC_NIslands_MCRegisters;
285271

286-
struct SMC_NIslands_MCArbDramTimingRegisterSet
287-
{
272+
struct SMC_NIslands_MCArbDramTimingRegisterSet {
288273
uint32_t mc_arb_dram_timing;
289274
uint32_t mc_arb_dram_timing2;
290275
uint8_t mc_arb_rfsh_rate;
@@ -293,17 +278,15 @@ struct SMC_NIslands_MCArbDramTimingRegisterSet
293278

294279
typedef struct SMC_NIslands_MCArbDramTimingRegisterSet SMC_NIslands_MCArbDramTimingRegisterSet;
295280

296-
struct SMC_NIslands_MCArbDramTimingRegisters
297-
{
281+
struct SMC_NIslands_MCArbDramTimingRegisters {
298282
uint8_t arb_current;
299283
uint8_t reserved[3];
300284
SMC_NIslands_MCArbDramTimingRegisterSet data[20];
301285
};
302286

303287
typedef struct SMC_NIslands_MCArbDramTimingRegisters SMC_NIslands_MCArbDramTimingRegisters;
304288

305-
struct SMC_NISLANDS_SPLL_DIV_TABLE
306-
{
289+
struct SMC_NISLANDS_SPLL_DIV_TABLE {
307290
uint32_t freq[256];
308291
uint32_t ss[256];
309292
};

0 commit comments

Comments
 (0)