From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: linux-kernel@vger.kernel.org, marcelo@conectiva.com
Subject: PATCH: make pcmcica devices report pcmcia bus info in gdrvinfo
Date: Mon, 14 Jul 2003 13:21:21 +0100 [thread overview]
Message-ID: <200307141221.h6ECLLDM030866@hraefn.swansea.linux.org.uk> (raw)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/3c574_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/3c574_cs.c
--- linux.22-pre5/drivers/net/pcmcia/3c574_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/3c574_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1202,6 +1202,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "3c574_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/axnet_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/axnet_cs.c
--- linux.22-pre5/drivers/net/pcmcia/axnet_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/axnet_cs.c 2003-06-29 16:09:56.000000000 +0100
@@ -833,6 +833,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "axnet_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/ibmtr_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/ibmtr_cs.c
--- linux.22-pre5/drivers/net/pcmcia/ibmtr_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/ibmtr_cs.c 2003-06-29 16:09:56.000000000 +0100
@@ -177,6 +177,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "ibmtr_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/pcnet_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/pcnet_cs.c
--- linux.22-pre5/drivers/net/pcmcia/pcnet_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/pcnet_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1226,6 +1226,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "pcnet_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/ray_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/ray_cs.c
--- linux.22-pre5/drivers/net/pcmcia/ray_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/ray_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1247,6 +1247,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "ray_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/smc91c92_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/smc91c92_cs.c
--- linux.22-pre5/drivers/net/pcmcia/smc91c92_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/smc91c92_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -2161,6 +2161,7 @@
struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
strcpy(info.driver, DRV_NAME);
strcpy(info.version, DRV_VERSION);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/wavelan_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/wavelan_cs.c
--- linux.22-pre5/drivers/net/pcmcia/wavelan_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/wavelan_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1902,6 +1902,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "wavelan_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/net/pcmcia/xirc2ps_cs.c linux.22-pre5-ac1/drivers/net/pcmcia/xirc2ps_cs.c
--- linux.22-pre5/drivers/net/pcmcia/xirc2ps_cs.c 2003-07-14 12:26:42.000000000 +0100
+++ linux.22-pre5-ac1/drivers/net/pcmcia/xirc2ps_cs.c 2003-06-29 16:09:55.000000000 +0100
@@ -1733,6 +1733,7 @@
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strncpy(info.driver, "xirc2ps_cs", sizeof(info.driver)-1);
+ sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
next reply other threads:[~2003-07-14 12:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-07-14 12:21 Alan Cox [this message]
2003-07-14 13:14 ` Russell King
2003-07-14 15:15 ` Alan Cox
2003-07-14 16:47 ` Marcelo Tosatti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200307141221.h6ECLLDM030866@hraefn.swansea.linux.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®