TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'soc_fsl-6.12-3' of https://github.com/chleroy/linux into arm/fixes

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2024-10-11 10:03:13 +00:00
parent 29ce0bca6d 1117b916f5
commit dec17c8b36
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/soc/fsl/qe/qmc.c
+5 -6
View File
@@ -1761,10 +1761,9 @@ static int qmc_qe_init_resources(struct qmc *qmc, struct platform_device *pdev)
*/ */
info = devm_qe_muram_alloc(qmc->dev, UCC_SLOW_PRAM_SIZE + 2 * 64, info = devm_qe_muram_alloc(qmc->dev, UCC_SLOW_PRAM_SIZE + 2 * 64,
ALIGNMENT_OF_UCC_SLOW_PRAM); ALIGNMENT_OF_UCC_SLOW_PRAM);
if (IS_ERR_VALUE(info)) { if (info < 0)
dev_err(qmc->dev, "cannot allocate MURAM for PRAM"); return info;
return -ENOMEM;
}
if (!qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, qmc->qe_subblock, if (!qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, qmc->qe_subblock,
QE_CR_PROTOCOL_UNSPECIFIED, info)) { QE_CR_PROTOCOL_UNSPECIFIED, info)) {
dev_err(qmc->dev, "QE_ASSIGN_PAGE_TO_DEVICE cmd failed"); dev_err(qmc->dev, "QE_ASSIGN_PAGE_TO_DEVICE cmd failed");
@@ -2056,7 +2055,7 @@ static void qmc_remove(struct platform_device *pdev)
qmc_exit_xcc(qmc); qmc_exit_xcc(qmc);
} }
static const struct qmc_data qmc_data_cpm1 = { static const struct qmc_data qmc_data_cpm1 __maybe_unused = {
.version = QMC_CPM1, .version = QMC_CPM1,
.tstate = 0x30000000, .tstate = 0x30000000,
.rstate = 0x31000000, .rstate = 0x31000000,
@@ -2066,7 +2065,7 @@ static const struct qmc_data qmc_data_cpm1 = {
.rpack = 0x00000000, .rpack = 0x00000000,
}; };
static const struct qmc_data qmc_data_qe = { static const struct qmc_data qmc_data_qe __maybe_unused = {
.version = QMC_QE, .version = QMC_QE,
.tstate = 0x30000000, .tstate = 0x30000000,
.rstate = 0x30000000, .rstate = 0x30000000,