Skip to content

Commit dec17c8

Browse files
committed
Merge tag 'soc_fsl-6.12-3' of https://github.com/chleroy/linux into arm/fixes
FSL SOC fixes for v6.12: - Fix a "cast to pointer from integer of different size" build error due to IS_ERROR_VALUE() used with something which is not a pointer. - Fix an unused data build warning. * tag 'soc_fsl-6.12-3' of https://github.com/chleroy/linux: soc: fsl: cpm1: qmc: Fix unused data compilation warning soc: fsl: cpm1: qmc: Do not use IS_ERR_VALUE() on error pointers Link: https://lore.kernel.org/r/c954bdb0-0c16-491a-8662-37e58f07208f@csgroup.eu Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 29ce0bc + 1117b91 commit dec17c8

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/soc/fsl/qe/qmc.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,10 +1761,9 @@ static int qmc_qe_init_resources(struct qmc *qmc, struct platform_device *pdev)
17611761
*/
17621762
info = devm_qe_muram_alloc(qmc->dev, UCC_SLOW_PRAM_SIZE + 2 * 64,
17631763
ALIGNMENT_OF_UCC_SLOW_PRAM);
1764-
if (IS_ERR_VALUE(info)) {
1765-
dev_err(qmc->dev, "cannot allocate MURAM for PRAM");
1766-
return -ENOMEM;
1767-
}
1764+
if (info < 0)
1765+
return info;
1766+
17681767
if (!qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, qmc->qe_subblock,
17691768
QE_CR_PROTOCOL_UNSPECIFIED, info)) {
17701769
dev_err(qmc->dev, "QE_ASSIGN_PAGE_TO_DEVICE cmd failed");
@@ -2056,7 +2055,7 @@ static void qmc_remove(struct platform_device *pdev)
20562055
qmc_exit_xcc(qmc);
20572056
}
20582057

2059-
static const struct qmc_data qmc_data_cpm1 = {
2058+
static const struct qmc_data qmc_data_cpm1 __maybe_unused = {
20602059
.version = QMC_CPM1,
20612060
.tstate = 0x30000000,
20622061
.rstate = 0x31000000,
@@ -2066,7 +2065,7 @@ static const struct qmc_data qmc_data_cpm1 = {
20662065
.rpack = 0x00000000,
20672066
};
20682067

2069-
static const struct qmc_data qmc_data_qe = {
2068+
static const struct qmc_data qmc_data_qe __maybe_unused = {
20702069
.version = QMC_QE,
20712070
.tstate = 0x30000000,
20722071
.rstate = 0x30000000,

0 commit comments

Comments
 (0)