ChangeSet 1.1152.2.4, 2003/08/14 16:53:55-07:00, greg@kroah.com

Remove usage of struct device.name from pcmcia layer


 drivers/pcmcia/i82365.c       |    3 ---
 drivers/pcmcia/tcic.c         |    3 ---
 drivers/pcmcia/yenta_socket.c |    2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)


diff -Nru a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
--- a/drivers/pcmcia/i82365.c	Fri Aug 15 11:16:00 2003
+++ b/drivers/pcmcia/i82365.c	Fri Aug 15 11:16:00 2003
@@ -1361,9 +1361,6 @@
 static struct platform_device i82365_device = {
 	.name = "i82365",
 	.id = 0,
-	.dev = {
-		.name = "i82365",
-	},
 };
 
 static int __init init_i82365(void)
diff -Nru a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
--- a/drivers/pcmcia/tcic.c	Fri Aug 15 11:16:00 2003
+++ b/drivers/pcmcia/tcic.c	Fri Aug 15 11:16:00 2003
@@ -372,9 +372,6 @@
 static struct platform_device tcic_device = {
 	.name = "tcic-pcmcia",
 	.id = 0,
-	.dev = {
-		.name = "tcic-pcmcia",
-	},
 };
 
 
diff -Nru a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
--- a/drivers/pcmcia/yenta_socket.c	Fri Aug 15 11:16:00 2003
+++ b/drivers/pcmcia/yenta_socket.c	Fri Aug 15 11:16:00 2003
@@ -899,7 +899,7 @@
 
 	/* We must finish initialization here */
 
-	if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, SA_SHIRQ, socket->dev->dev.name, socket)) {
+	if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, SA_SHIRQ, pci_name(socket->dev), socket)) {
 		/* No IRQ or request_irq failed. Poll */
 		socket->cb_irq = 0; /* But zero is a valid IRQ number. */
 		init_timer(&socket->poll_timer);