From: Andrew Morton <akpm@osdl.org>
Date: Tue, 30 Jan 2007 08:59:14 +0000 (-0800)
Subject: pata_platform: set_mode fix
X-Git-Tag: v2.6.20-rc7~14^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2ca6611b1fc1f913f5370b3c50a0a35d817491b3;p=linux-2.6-omap-h63xx.git

pata_platform: set_mode fix

drivers/ata/pata_platform.c:85: warning: initialization from incompatible pointer type

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 443b1d85c6c..ca2999f9f04 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -30,7 +30,8 @@ static int pio_mask = 1;
  * Provide our own set_mode() as we don't want to change anything that has
  * already been configured..
  */
-static void pata_platform_set_mode(struct ata_port *ap)
+static int pata_platform_set_mode(struct ata_port *ap,
+				struct ata_device **r_failed_dev)
 {
 	int i;
 
@@ -44,6 +45,7 @@ static void pata_platform_set_mode(struct ata_port *ap)
 			dev->flags |= ATA_DFLAG_PIO;
 		}
 	}
+	return 0;
 }
 
 static void pata_platform_host_stop(struct ata_host *host)