Skip to content

Commit a269ff3

Browse files
committed
memory: fsl_ifc: Fix whitespace issues
Fix minor whitespace and comment issues. Do not break message strings. No functional changes. Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent a615974 commit a269ff3

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

drivers/memory/fsl_ifc.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ int fsl_ifc_find(phys_addr_t addr_base)
5353

5454
for (i = 0; i < fsl_ifc_ctrl_dev->banks; i++) {
5555
u32 cspr = ifc_in32(&fsl_ifc_ctrl_dev->gregs->cspr_cs[i].cspr);
56+
5657
if (cspr & CSPR_V && (cspr & CSPR_BA) ==
5758
convert_ifc_address(addr_base))
5859
return i;
@@ -153,8 +154,8 @@ static irqreturn_t fsl_ifc_ctrl_irq(int irqno, void *data)
153154
/* read for chip select error */
154155
cs_err = ifc_in32(&ifc->cm_evter_stat);
155156
if (cs_err) {
156-
dev_err(ctrl->dev, "transaction sent to IFC is not mapped to"
157-
"any memory bank 0x%08X\n", cs_err);
157+
dev_err(ctrl->dev, "transaction sent to IFC is not mapped to any memory bank 0x%08X\n",
158+
cs_err);
158159
/* clear the chip select error */
159160
ifc_out32(IFC_CM_EVTER_STAT_CSER, &ifc->cm_evter_stat);
160161

@@ -163,24 +164,24 @@ static irqreturn_t fsl_ifc_ctrl_irq(int irqno, void *data)
163164
err_addr = ifc_in32(&ifc->cm_erattr1);
164165

165166
if (status & IFC_CM_ERATTR0_ERTYP_READ)
166-
dev_err(ctrl->dev, "Read transaction error"
167-
"CM_ERATTR0 0x%08X\n", status);
167+
dev_err(ctrl->dev, "Read transaction error CM_ERATTR0 0x%08X\n",
168+
status);
168169
else
169-
dev_err(ctrl->dev, "Write transaction error"
170-
"CM_ERATTR0 0x%08X\n", status);
170+
dev_err(ctrl->dev, "Write transaction error CM_ERATTR0 0x%08X\n",
171+
status);
171172

172173
err_axiid = (status & IFC_CM_ERATTR0_ERAID) >>
173174
IFC_CM_ERATTR0_ERAID_SHIFT;
174-
dev_err(ctrl->dev, "AXI ID of the error"
175-
"transaction 0x%08X\n", err_axiid);
175+
dev_err(ctrl->dev, "AXI ID of the error transaction 0x%08X\n",
176+
err_axiid);
176177

177178
err_srcid = (status & IFC_CM_ERATTR0_ESRCID) >>
178179
IFC_CM_ERATTR0_ESRCID_SHIFT;
179-
dev_err(ctrl->dev, "SRC ID of the error"
180-
"transaction 0x%08X\n", err_srcid);
180+
dev_err(ctrl->dev, "SRC ID of the error transaction 0x%08X\n",
181+
err_srcid);
181182

182-
dev_err(ctrl->dev, "Transaction Address corresponding to error"
183-
"ERADDR 0x%08X\n", err_addr);
183+
dev_err(ctrl->dev, "Transaction Address corresponding to error ERADDR 0x%08X\n",
184+
err_addr);
184185

185186
ret = IRQ_HANDLED;
186187
}
@@ -199,7 +200,7 @@ static irqreturn_t fsl_ifc_ctrl_irq(int irqno, void *data)
199200
* the resources needed for the controller only. The
200201
* resources for the NAND banks themselves are allocated
201202
* in the chip probe function.
202-
*/
203+
*/
203204
static int fsl_ifc_ctrl_probe(struct platform_device *dev)
204205
{
205206
int ret = 0;
@@ -250,8 +251,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
250251
/* get the Controller level irq */
251252
fsl_ifc_ctrl_dev->irq = irq_of_parse_and_map(dev->dev.of_node, 0);
252253
if (fsl_ifc_ctrl_dev->irq == 0) {
253-
dev_err(&dev->dev, "failed to get irq resource "
254-
"for IFC\n");
254+
dev_err(&dev->dev, "failed to get irq resource for IFC\n");
255255
ret = -ENODEV;
256256
goto err;
257257
}

0 commit comments

Comments
 (0)