aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ds.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-06-19 14:12:34 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-06-24 09:33:42 -0400
commitc5081d5f4775b2a3f858f91151bbf9163e473075 (patch)
tree8e9e077e8011fd7bf888b491711933f8c90f0cf0 /drivers/pcmcia/ds.c
parentc502380170ee93fd1f4028cc1f32efc87fde7376 (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/ds.c')
-rw-r--r--drivers/pcmcia/ds.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index e40775443d04..0f56cb5a30be 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -741,9 +741,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
741 741
742static int pcmcia_card_add(struct pcmcia_socket *s) 742static int pcmcia_card_add(struct pcmcia_socket *s)
743{ 743{
744 cisinfo_t cisinfo;
745 cistpl_longlink_mfc_t mfc; 744 cistpl_longlink_mfc_t mfc;
746 unsigned int no_funcs, i; 745 unsigned int no_funcs, i, no_chains;
747 int ret = 0; 746 int ret = 0;
748 747
749 if (!(s->resource_setup_done)) { 748 if (!(s->resource_setup_done)) {
@@ -757,8 +756,8 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
757 return -EAGAIN; /* try again, but later... */ 756 return -EAGAIN; /* try again, but later... */
758 } 757 }
759 758
760 ret = pccard_validate_cis(s, BIND_FN_ALL, &cisinfo); 759 ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);
761 if (ret || !cisinfo.Chains) { 760 if (ret || !no_chains) {
762 ds_dbg(0, "invalid CIS or invalid resources\n"); 761 ds_dbg(0, "invalid CIS or invalid resources\n");
763 return -ENODEV; 762 return -ENODEV;
764 } 763 }