mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/ide/tx4939ide.c
..
..
@@ -156,7 +156,6 @@
156
156
 		u16 sysctl = tx4939ide_readw(base, TX4939IDE_Sys_Ctl);
157
157
 
158
158
 		tx4939ide_writew(sysctl | 0x4000, base, TX4939IDE_Sys_Ctl);
159
-		mmiowb();
160
159
 		/* wait 12GBUSCLK (typ. 60ns @ GBUS200MHz, max 270ns) */
161
160
 		ndelay(270);
162
161
 		tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl);
..
..
@@ -364,9 +363,9 @@
364
363
 	case TX4939IDE_INT_HOST | TX4939IDE_INT_XFEREND:
365
364
 		dma_stat = tx4939ide_readb(base, TX4939IDE_DMA_Stat);
366
365
 		if (!(dma_stat & ATA_DMA_INTR))
367
-			pr_warning("%s: weird interrupt status. "
368
-				   "DMA_Stat %#02x int_ctl %#04x\n",
369
-				   hwif->name, dma_stat, ctl);
366
+			pr_warn("%s: weird interrupt status. "
367
+				"DMA_Stat %#02x int_ctl %#04x\n",
368
+				hwif->name, dma_stat, ctl);
370
369
 		found = 1;
371
370
 		break;
372
371
 	}
..
..
@@ -396,7 +395,6 @@
396
395
 
397
396
 	/* Soft Reset */
398
397
 	tx4939ide_writew(0x8000, base, TX4939IDE_Sys_Ctl);
399
-	mmiowb();
400
398
 	/* at least 20 GBUSCLK (typ. 100ns @ GBUS200MHz, max 450ns) */
401
399
 	ndelay(450);
402
400
 	tx4939ide_writew(0x0000, base, TX4939IDE_Sys_Ctl);
..
..
@@ -551,7 +549,7 @@
551
549
 		return -ENODEV;
552
550
 
553
551
 	if (!devm_request_mem_region(&pdev->dev, res->start,
554
-				     resource_size(res), "tx4938ide"))
552
+				     resource_size(res), MODNAME))
555
553
 		return -EBUSY;
556
554
 	mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
557
555
 					      resource_size(res));