lkml.org 
[lkml]   [2003]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH] Driver Core fixes for 2.6.0-test3
From
Date
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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:47    [W:0.074 / U:0.440 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site