commit d64cebd350e65e531d1947717a8284661e57a365
Author: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Date:   Wed May 30 07:14:09 2007 +0200

    at32_cf: fix compile errors and warnings for 2.6.21.1
    
    Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>

diff --git a/drivers/pcmcia/at32_cf.c b/drivers/pcmcia/at32_cf.c
index da3eb98..7165c39 100644
--- a/drivers/pcmcia/at32_cf.c
+++ b/drivers/pcmcia/at32_cf.c
@@ -185,19 +185,19 @@ static int at32_cf_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
 
 static int at32_cf_socket_init(struct pcmcia_socket *sock)
 {
+#ifdef DEBUG
 	struct at32_cf_socket *cf = to_at32_cf(sock);
-
 	debug(cf, 2, "called\n");
-
+#endif
 	return 0;
 }
 
 static int at32_cf_suspend(struct pcmcia_socket *sock)
 {
+#ifdef DEBUG
 	struct at32_cf_socket *cf = to_at32_cf(sock);
-
 	debug(cf, 2, "called\n");
-
+#endif
 	at32_cf_set_socket(sock, &dead_socket);
 
 	return 0;
@@ -343,7 +343,7 @@ static int __init at32_cf_probe(struct platform_device *pdev)
 	cf->socket.pci_irq = irq;
 	cf->socket.ops = &at32_cf_ops;
 	cf->socket.resource_ops = &pccard_static_ops;
-	cf->socket.dev.dev = &pdev->dev;
+	cf->socket.dev.parent = &pdev->dev;
 	cf->socket.owner = THIS_MODULE;
 	cf->socket.features =
 		SS_CAP_MEM_ALIGN | SS_CAP_STATIC_MAP | SS_CAP_PCCARD;
@@ -420,8 +420,7 @@ static int __init at32_cf_probe(struct platform_device *pdev)
 	}
 
 	if (cf->reset_pin >= 0) {
-		gpio_set_value(cf->reset_pin, 0);
-		gpio_direction_output(cf->reset_pin);
+		gpio_direction_output(cf->reset_pin, 0);
 	}
 
 	platform_set_drvdata(pdev, cf);