Skip to content

Commit 45ec2da

Browse files
sudeep-hollaJassiBrar
authored andcommitted
mailbox: pcc: Drop handling invalid bit-width in {read,write}_register
pcc_chan_reg_init now checks if the register bit width is within the list [8, 16, 32, 64] and flags error if that is not the case. Therefore there is no need to handling invalid bit-width in both read_register and write_register. We can drop that along with the return values for these 2 functions. Signed-off-by: Sudeep Holla <[email protected]> Signed-off-by: Jassi Brar <[email protected]>
1 parent bf18123 commit 45ec2da

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

drivers/mailbox/pcc.c

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ static struct mbox_controller pcc_mbox_ctrl = {};
110110
* The below read_register and write_registers are used to read and
111111
* write from perf critical registers such as PCC doorbell register
112112
*/
113-
static int read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width)
113+
static void read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width)
114114
{
115-
int ret_val = 0;
116-
117115
switch (bit_width) {
118116
case 8:
119117
*val = readb(vaddr);
@@ -127,19 +125,11 @@ static int read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width)
127125
case 64:
128126
*val = readq(vaddr);
129127
break;
130-
default:
131-
pr_debug("Error: Cannot read register of %u bit width",
132-
bit_width);
133-
ret_val = -EFAULT;
134-
break;
135128
}
136-
return ret_val;
137129
}
138130

139-
static int write_register(void __iomem *vaddr, u64 val, unsigned int bit_width)
131+
static void write_register(void __iomem *vaddr, u64 val, unsigned int bit_width)
140132
{
141-
int ret_val = 0;
142-
143133
switch (bit_width) {
144134
case 8:
145135
writeb(val, vaddr);
@@ -153,13 +143,7 @@ static int write_register(void __iomem *vaddr, u64 val, unsigned int bit_width)
153143
case 64:
154144
writeq(val, vaddr);
155145
break;
156-
default:
157-
pr_debug("Error: Cannot write register of %u bit width",
158-
bit_width);
159-
ret_val = -EFAULT;
160-
break;
161146
}
162-
return ret_val;
163147
}
164148

165149
static int pcc_chan_reg_read(struct pcc_chan_reg *reg, u64 *val)
@@ -172,7 +156,7 @@ static int pcc_chan_reg_read(struct pcc_chan_reg *reg, u64 *val)
172156
}
173157

174158
if (reg->vaddr)
175-
ret = read_register(reg->vaddr, val, reg->gas->bit_width);
159+
read_register(reg->vaddr, val, reg->gas->bit_width);
176160
else
177161
ret = acpi_read(val, reg->gas);
178162

@@ -187,7 +171,7 @@ static int pcc_chan_reg_write(struct pcc_chan_reg *reg, u64 val)
187171
return 0;
188172

189173
if (reg->vaddr)
190-
ret = write_register(reg->vaddr, val, reg->gas->bit_width);
174+
write_register(reg->vaddr, val, reg->gas->bit_width);
191175
else
192176
ret = acpi_write(val, reg->gas);
193177

0 commit comments

Comments
 (0)