2020-02-12 09:12:19

by Geert Uytterhoeven

Subject: [PATCH] scsi: zorro_esp: Restore devm_ioremap() alignment

Restore alignment of the continuations of the ioremap() calls in
zorro_esp_probe(). Join lines where all parameters can fit on a single
line.

Fixes: 4bdc0d676a643140 ("remove ioremap_nocache and devm_ioremap_nocache")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/scsi/zorro_esp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/zorro_esp.c b/drivers/scsi/zorro_esp.c
index bdd82e497d5fcb7c..c6727bcbc2e3268d 100644
--- a/drivers/scsi/zorro_esp.c
+++ b/drivers/scsi/zorro_esp.c
@@ -801,8 +801,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
/* additional setup required for Fastlane */
if (zep->zorro3 && ent->driver_data == ZORRO_BLZ1230II) {
/* map full address space up to ESP base for DMA */
- zep->board_base = ioremap(board,
- FASTLANE_ESP_ADDR-1);
+ zep->board_base = ioremap(board, FASTLANE_ESP_ADDR - 1);
if (!zep->board_base) {
pr_err("Cannot allocate board address space\n");
err = -ENOMEM;
@@ -843,7 +842,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
* dma_registers size if adding any more
*/
esp->dma_regs = ioremap(dmaaddr,
- sizeof(struct fastlane_dma_registers));
+ sizeof(struct fastlane_dma_registers));
} else
/* ZorroII address space remapped nocache by early startup */
esp->dma_regs = ZTWO_VADDR(dmaaddr);
--
2.17.1

2020-02-13 03:48:30

by Martin K. Petersen

Subject: Re: [PATCH] scsi: zorro_esp: Restore devm_ioremap() alignment

Geert,

> Restore alignment of the continuations of the ioremap() calls in
> zorro_esp_probe(). Join lines where all parameters can fit on a single
> line.

Applied to 5.7/scsi-queue, thanks!

--
Martin K. Petersen Oracle Linux Engineering