Patchwork ide: icside.c: fix printk format string compile warning

login
register
mail settings
Submitter Christian Dietrich
Date June 5, 2012, 12:28 p.m.
Message ID <86zk8i2b90.fsf@gandalf.zerties.org>
Download mbox | patch
Permalink /patch/163068/
State Accepted
Delegated to: David Miller
Headers show

Comments

Christian Dietrich - June 5, 2012, 12:28 p.m.
Use correct format string parameter for the peak datarate, and prevent
uninitialized use of cycle_time.

Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
---
 drivers/ide/icside.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
David Miller - June 6, 2012, 5:37 p.m.
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Tue, 05 Jun 2012 14:28:59 +0200

> Use correct format string parameter for the peak datarate, and prevent
> uninitialized use of cycle_time.
> 
> Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 83e5100..bcb507b 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -236,7 +236,7 @@  static const struct ide_port_ops icside_v6_no_dma_port_ops = {
  */
 static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-	unsigned long cycle_time;
+	unsigned long cycle_time = 0;
 	int use_dma_info = 0;
 	const u8 xfer_mode = drive->dma_mode;
 
@@ -271,9 +271,9 @@  static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 
 	ide_set_drivedata(drive, (void *)cycle_time);
 
-	printk("%s: %s selected (peak %dMB/s)\n", drive->name,
-		ide_xfer_verbose(xfer_mode),
-		2000 / (unsigned long)ide_get_drivedata(drive));
+	printk(KERN_INFO "%s: %s selected (peak %luMB/s)\n",
+	       drive->name, ide_xfer_verbose(xfer_mode),
+	       2000 / (cycle_time ? cycle_time : (unsigned long) -1));
 }
 
 static const struct ide_port_ops icside_v6_port_ops = {