Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index 24c2a46c1476..fbfadbac67e8 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -80,7 +80,7 @@ static int ssb_pcmcia_cfg_write(struct ssb_bus *bus, u8 offset, u8 value)
         reg.Action = CS_WRITE;
         reg.Value = value;
         res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
-        if (unlikely(res != CS_SUCCESS))
+        if (unlikely(res != 0))
                 return -EBUSY;
 
         return 0;
@@ -96,7 +96,7 @@ static int ssb_pcmcia_cfg_read(struct ssb_bus *bus, u8 offset, u8 *value)
         reg.Offset = offset;
         reg.Action = CS_READ;
         res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
-        if (unlikely(res != CS_SUCCESS))
+        if (unlikely(res != 0))
                 return -EBUSY;
         *value = reg.Value;
 
@@ -638,17 +638,17 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl");
+        GOTO_ERROR_ON(res != 0, "MAC first tpl");
         res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl data");
+        GOTO_ERROR_ON(res != 0, "MAC first tpl data");
         while (1) {
                 GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
                 if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
                         break;
                 res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl");
+                GOTO_ERROR_ON(res != 0, "MAC next tpl");
                 res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl data");
+                GOTO_ERROR_ON(res != 0, "MAC next tpl data");
         }
         GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
         memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
@@ -659,9 +659,9 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl");
+        GOTO_ERROR_ON(res != 0, "VEN first tpl");
         res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl data");
+        GOTO_ERROR_ON(res != 0, "VEN first tpl data");
         while (1) {
                 GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
                 switch (tuple.TupleData[0]) {
@@ -733,11 +733,11 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
                         break;
                 }
                 res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-                if (res == CS_NO_MORE_ITEMS)
+                if (res == -ENOSPC)
                         break;
-                GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl");
+                GOTO_ERROR_ON(res != 0, "VEN next tpl");
                 res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl data");
+                GOTO_ERROR_ON(res != 0, "VEN next tpl data");
         }
 
         return 0;