diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-06-19 14:12:34 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-06-24 09:33:42 -0400 |
commit | c5081d5f4775b2a3f858f91151bbf9163e473075 (patch) | |
tree | 8e9e077e8011fd7bf888b491711933f8c90f0cf0 /drivers/pcmcia/socket_sysfs.c | |
parent | c502380170ee93fd1f4028cc1f32efc87fde7376 (diff) |
pcmcia: simplify pccard_validate_cis
As cisinfo_t only contains one unsigned_int, pccard_validate_cis can
be simplified by passing that around directly.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/socket_sysfs.c')
-rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 562384d6f321..ff079987db1d 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
@@ -293,7 +293,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj, | |||
293 | count = 0; | 293 | count = 0; |
294 | else { | 294 | else { |
295 | struct pcmcia_socket *s; | 295 | struct pcmcia_socket *s; |
296 | cisinfo_t cisinfo; | 296 | unsigned int chains; |
297 | 297 | ||
298 | if (off + count > size) | 298 | if (off + count > size) |
299 | count = size - off; | 299 | count = size - off; |
@@ -302,9 +302,9 @@ static ssize_t pccard_show_cis(struct kobject *kobj, | |||
302 | 302 | ||
303 | if (!(s->state & SOCKET_PRESENT)) | 303 | if (!(s->state & SOCKET_PRESENT)) |
304 | return -ENODEV; | 304 | return -ENODEV; |
305 | if (pccard_validate_cis(s, BIND_FN_ALL, &cisinfo)) | 305 | if (pccard_validate_cis(s, BIND_FN_ALL, &chains)) |
306 | return -EIO; | 306 | return -EIO; |
307 | if (!cisinfo.Chains) | 307 | if (!chains) |
308 | return -ENODATA; | 308 | return -ENODATA; |
309 | 309 | ||
310 | count = pccard_extract_cis(s, buf, off, count); | 310 | count = pccard_extract_cis(s, buf, off, count); |