2003-07-14 12:10:41

by Alan

Subject: PATCH: make pcmcica devices report pcmcia bus info in gdrvinfo

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;

2003-07-14 13:00:43

by Russell King

Subject: Re: PATCH: make pcmcica devices report pcmcia bus info in gdrvinfo

On Mon, Jul 14, 2003 at 01:21:21PM +0100, Alan Cox wrote:
> 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;

We should probably ensure that the bus info is compatible with the bus
info which Dominik's going to be using in 2.6.x

--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

2003-07-14 15:04:11

by Alan

Subject: Re: PATCH: make pcmcica devices report pcmcia bus info in gdrvinfo

On Llu, 2003-07-14 at 14:14, Russell King wrote:
> > 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;
>
> We should probably ensure that the bus info is compatible with the bus
> info which Dominik's going to be using in 2.6.x

I think thats a good point. Marcelo , bin that diff for now

2003-07-14 16:39:52

by Marcelo Tosatti

Subject: Re: PATCH: make pcmcica devices report pcmcia bus info in gdrvinfo

On Mon, 14 Jul 2003, Alan Cox wrote:

> On Llu, 2003-07-14 at 14:14, Russell King wrote:
> > > 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;
> >
> > We should probably ensure that the bus info is compatible with the bus
> > info which Dominik's going to be using in 2.6.x
>
> I think thats a good point. Marcelo , bin that diff for now

Done.