hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Link: https://lore.kernel.org/r/20200212085138.10009-1-geert+renesas@glider.be
Fixes: 4bdc0d676a ("remove ioremap_nocache and devm_ioremap_nocache")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Geert Uytterhoeven 2020-02-12 09:51:38 +01:00 committed by Martin K. Petersen
parent 1cbadd0c33
commit 0d9630084c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/zorro_esp.c
View File

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