Skip to content

Commit b4f63bb

Browse files
quic-bjorandeandersson
authored andcommitted
soc: qcom: aoss: Tidy up qmp_send() callers
With qmp_send() handling variable length messages and string formatting he callers of qmp_send() can be cleaned up to not care about these things. Drop the QMP_MSG_LEN sized buffers and use the message formatting, as appropriate. Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com> Link: https://lore.kernel.org/r/20230811205839.727373-5-quic_bjorande@quicinc.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 8873d1e commit b4f63bb

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

drivers/net/ipa/ipa_power.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,12 @@ void ipa_power_retention(struct ipa *ipa, bool enable)
324324
{
325325
static const char fmt[] = "{ class: bcm, res: ipa_pc, val: %c }";
326326
struct ipa_power *power = ipa->power;
327-
char buf[36]; /* Exactly enough for fmt[]; size a multiple of 4 */
328327
int ret;
329328

330329
if (!power->qmp)
331330
return; /* Not needed on this platform */
332331

333-
(void)snprintf(buf, sizeof(buf), fmt, enable ? '1' : '0');
334-
335-
ret = qmp_send(power->qmp, buf);
332+
ret = qmp_send(power->qmp, fmt, enable ? '1' : '0');
336333
if (ret)
337334
dev_err(power->dev, "error %d sending QMP %sable request\n",
338335
ret, enable ? "en" : "dis");

drivers/remoteproc/qcom_q6v5.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,13 @@
2323

2424
static int q6v5_load_state_toggle(struct qcom_q6v5 *q6v5, bool enable)
2525
{
26-
char buf[Q6V5_LOAD_STATE_MSG_LEN];
2726
int ret;
2827

2928
if (!q6v5->qmp)
3029
return 0;
3130

32-
ret = snprintf(buf, sizeof(buf),
33-
"{class: image, res: load_state, name: %s, val: %s}",
31+
ret = qmp_send(q6v5->qmp, "{class: image, res: load_state, name: %s, val: %s}",
3432
q6v5->load_state, enable ? "on" : "off");
35-
36-
WARN_ON(ret >= Q6V5_LOAD_STATE_MSG_LEN);
37-
38-
ret = qmp_send(q6v5->qmp, buf);
3933
if (ret)
4034
dev_err(q6v5->dev, "failed to toggle load state\n");
4135

drivers/soc/qcom/qcom_aoss.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,15 @@ EXPORT_SYMBOL(qmp_send);
264264

265265
static int qmp_qdss_clk_prepare(struct clk_hw *hw)
266266
{
267-
static const char buf[QMP_MSG_LEN] = "{class: clock, res: qdss, val: 1}";
267+
static const char *buf = "{class: clock, res: qdss, val: 1}";
268268
struct qmp *qmp = container_of(hw, struct qmp, qdss_clk);
269269

270270
return qmp_send(qmp, buf);
271271
}
272272

273273
static void qmp_qdss_clk_unprepare(struct clk_hw *hw)
274274
{
275-
static const char buf[QMP_MSG_LEN] = "{class: clock, res: qdss, val: 0}";
275+
static const char *buf = "{class: clock, res: qdss, val: 0}";
276276
struct qmp *qmp = container_of(hw, struct qmp, qdss_clk);
277277

278278
qmp_send(qmp, buf);
@@ -334,7 +334,6 @@ static int qmp_cdev_set_cur_state(struct thermal_cooling_device *cdev,
334334
unsigned long state)
335335
{
336336
struct qmp_cooling_device *qmp_cdev = cdev->devdata;
337-
char buf[QMP_MSG_LEN] = {};
338337
bool cdev_state;
339338
int ret;
340339

@@ -344,13 +343,8 @@ static int qmp_cdev_set_cur_state(struct thermal_cooling_device *cdev,
344343
if (qmp_cdev->state == state)
345344
return 0;
346345

347-
snprintf(buf, sizeof(buf),
348-
"{class: volt_flr, event:zero_temp, res:%s, value:%s}",
349-
qmp_cdev->name,
350-
cdev_state ? "on" : "off");
351-
352-
ret = qmp_send(qmp_cdev->qmp, buf);
353-
346+
ret = qmp_send(qmp_cdev->qmp, "{class: volt_flr, event:zero_temp, res:%s, value:%s}",
347+
qmp_cdev->name, cdev_state ? "on" : "off");
354348
if (!ret)
355349
qmp_cdev->state = cdev_state;
356350

0 commit comments

Comments
 (0)