Skip to content

Commit 3a60e2a

Browse files
author
Georgi Djakov
committed
Merge branch 'icc-retire-macros' into icc-next
This is ripped out of the bigger patch series at [1], as this part doesn't really have any dependencies and (hopefully) brings no functional change. Compile-tested for the most part, bloat-o-meter reports no size change [1] https://lore.kernel.org/linux-arm-msm/[email protected]/ * icc-retire-macros interconnect: qcom: sc7180: Retire DEFINE_QNODE interconnect: qcom: sdm670: Retire DEFINE_QNODE interconnect: qcom: sdm845: Retire DEFINE_QNODE interconnect: qcom: sdx55: Retire DEFINE_QNODE interconnect: qcom: sdx65: Retire DEFINE_QNODE interconnect: qcom: sm6350: Retire DEFINE_QNODE interconnect: qcom: sm8150: Retire DEFINE_QNODE interconnect: qcom: sm8250: Retire DEFINE_QNODE interconnect: qcom: sm8350: Retire DEFINE_QNODE interconnect: qcom: icc-rpmh: Retire DEFINE_QNODE interconnect: qcom: sc7180: Retire DEFINE_QBCM interconnect: qcom: sdm670: Retire DEFINE_QBCM interconnect: qcom: sdm845: Retire DEFINE_QBCM interconnect: qcom: sdx55: Retire DEFINE_QBCM interconnect: qcom: sdx65: Retire DEFINE_QBCM interconnect: qcom: sm6350: Retire DEFINE_QBCM interconnect: qcom: sm8150: Retire DEFINE_QBCM interconnect: qcom: sm8250: Retire DEFINE_QBCM interconnect: qcom: sm8350: Retire DEFINE_QBCM interconnect: qcom: icc-rpmh: Retire DEFINE_QBCM Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Georgi Djakov <[email protected]>
2 parents e0d855b + a18e26a commit 3a60e2a

File tree

11 files changed

+11786
-1314
lines changed

11 files changed

+11786
-1314
lines changed

drivers/interconnect/qcom/bcm-voter.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@
1212

1313
#include "icc-rpmh.h"
1414

15-
#define DEFINE_QBCM(_name, _bcmname, _keepalive, ...) \
16-
static struct qcom_icc_bcm _name = { \
17-
.name = _bcmname, \
18-
.keepalive = _keepalive, \
19-
.num_nodes = ARRAY_SIZE(((struct qcom_icc_node *[]){ __VA_ARGS__ })), \
20-
.nodes = { __VA_ARGS__ }, \
21-
}
22-
2315
struct bcm_voter *of_bcm_voter_get(struct device *dev, const char *name);
2416
void qcom_icc_bcm_voter_add(struct bcm_voter *voter, struct qcom_icc_bcm *bcm);
2517
int qcom_icc_bcm_voter_commit(struct bcm_voter *voter);

drivers/interconnect/qcom/icc-rpmh.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,6 @@ struct qcom_icc_desc {
120120
size_t num_bcms;
121121
};
122122

123-
#define DEFINE_QNODE(_name, _id, _channels, _buswidth, ...) \
124-
static struct qcom_icc_node _name = { \
125-
.id = _id, \
126-
.name = #_name, \
127-
.channels = _channels, \
128-
.buswidth = _buswidth, \
129-
.num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })), \
130-
.links = { __VA_ARGS__ }, \
131-
}
132-
133123
int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,
134124
u32 peak_bw, u32 *agg_avg, u32 *agg_peak);
135125
int qcom_icc_set(struct icc_node *src, struct icc_node *dst);

drivers/interconnect/qcom/sc7180.c

Lines changed: 1451 additions & 162 deletions
Large diffs are not rendered by default.

drivers/interconnect/qcom/sdm670.c

Lines changed: 1245 additions & 141 deletions
Large diffs are not rendered by default.

drivers/interconnect/qcom/sdm845.c

Lines changed: 1496 additions & 159 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)