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, 41 insertions, 37 deletions

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index d1207393fc3e..c68c5d338285 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -61,7 +61,7 @@ INT_MODULE_PARM(unreset_limit,	30);		/* unreset_check's */
 /* Access speed for attribute memory windows */
 INT_MODULE_PARM(cis_speed,      300);           /* ns */
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 static int pc_debug;
 
 module_param(pc_debug, int, 0644);
@@ -247,7 +247,8 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
 
         wait_for_completion(&socket->thread_done);
         if (!socket->thread) {
-                printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket);
+                dev_printk(KERN_WARNING, &socket->dev,
+                           "PCMCIA: warning: socket thread did not start\n");
                 return -EIO;
         }
 
@@ -366,16 +367,16 @@ static int socket_reset(struct pcmcia_socket *skt)
                 skt->ops->get_status(skt, &status);
 
                 if (!(status & SS_DETECT))
-                        return CS_NO_CARD;
+                        return -ENODEV;
 
                 if (status & SS_READY)
-                        return CS_SUCCESS;
+                        return 0;
 
                 msleep(unreset_check * 10);
         }
 
         cs_err(skt, "time out after reset.\n");
-        return CS_GENERAL_FAILURE;
+        return -ETIMEDOUT;
 }
 
 /*
@@ -412,7 +413,8 @@ static void socket_shutdown(struct pcmcia_socket *s)
 
         s->ops->get_status(s, &status);
         if (status & SS_POWERON) {
-                printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);
+                dev_printk(KERN_ERR, &s->dev,
+                           "*** DANGER *** unable to remove socket power\n");
         }
 
         cs_socket_put(s);
@@ -426,14 +428,14 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
 
         skt->ops->get_status(skt, &status);
         if (!(status & SS_DETECT))
-                return CS_NO_CARD;
+                return -ENODEV;
 
         msleep(initial_delay * 10);
 
         for (i = 0; i < 100; i++) {
                 skt->ops->get_status(skt, &status);
                 if (!(status & SS_DETECT))
-                        return CS_NO_CARD;
+                        return -ENODEV;
 
                 if (!(status & SS_PENDING))
                         break;
@@ -443,13 +445,13 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
 
         if (status & SS_PENDING) {
                 cs_err(skt, "voltage interrogation timed out.\n");
-                return CS_GENERAL_FAILURE;
+                return -ETIMEDOUT;
         }
 
         if (status & SS_CARDBUS) {
                 if (!(skt->features & SS_CAP_CARDBUS)) {
                         cs_err(skt, "cardbus cards are not supported.\n");
-                        return CS_BAD_TYPE;
+                        return -EINVAL;
                 }
                 skt->state |= SOCKET_CARDBUS;
         }
@@ -463,7 +465,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
                 skt->socket.Vcc = skt->socket.Vpp = 50;
         else {
                 cs_err(skt, "unsupported voltage key.\n");
-                return CS_BAD_TYPE;
+                return -EIO;
         }
 
         if (skt->power_hook)
@@ -480,7 +482,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
         skt->ops->get_status(skt, &status);
         if (!(status & SS_POWERON)) {
                 cs_err(skt, "unable to apply power.\n");
-                return CS_BAD_TYPE;
+                return -EIO;
         }
 
         status = socket_reset(skt);
@@ -502,15 +504,16 @@ static int socket_insert(struct pcmcia_socket *skt)
         cs_dbg(skt, 4, "insert\n");
 
         if (!cs_socket_get(skt))
-                return CS_NO_CARD;
+                return -ENODEV;
 
         ret = socket_setup(skt, setup_delay);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
                 skt->state |= SOCKET_PRESENT;
 
-                printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",
-                       (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
-                       skt->sock);
+                dev_printk(KERN_NOTICE, &skt->dev,
+                           "pccard: %s card inserted into slot %d\n",
+                           (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
+                           skt->sock);
 
 #ifdef CONFIG_CARDBUS
                 if (skt->state & SOCKET_CARDBUS) {
@@ -531,7 +534,7 @@ static int socket_insert(struct pcmcia_socket *skt)
 static int socket_suspend(struct pcmcia_socket *skt)
 {
         if (skt->state & SOCKET_SUSPEND)
-                return CS_IN_USE;
+                return -EBUSY;
 
         send_event(skt, CS_EVENT_PM_SUSPEND, CS_EVENT_PRI_LOW);
         skt->socket = dead_socket;
@@ -540,7 +543,7 @@ static int socket_suspend(struct pcmcia_socket *skt)
                 skt->ops->suspend(skt);
         skt->state |= SOCKET_SUSPEND;
 
-        return CS_SUCCESS;
+        return 0;
 }
 
 /*
@@ -553,7 +556,7 @@ static int socket_resume(struct pcmcia_socket *skt)
         int ret;
 
         if (!(skt->state & SOCKET_SUSPEND))
-                return CS_IN_USE;
+                return -EBUSY;
 
         skt->socket = dead_socket;
         skt->ops->init(skt);
@@ -565,7 +568,7 @@ static int socket_resume(struct pcmcia_socket *skt)
         }
 
         ret = socket_setup(skt, resume_delay);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
                 /*
                  * FIXME: need a better check here for cardbus cards.
                  */
@@ -590,12 +593,13 @@ static int socket_resume(struct pcmcia_socket *skt)
 
         skt->state &= ~SOCKET_SUSPEND;
 
-        return CS_SUCCESS;
+        return 0;
 }
 
 static void socket_remove(struct pcmcia_socket *skt)
 {
-        printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt->sock);
+        dev_printk(KERN_NOTICE, &skt->dev,
+                   "pccard: card ejected from slot %d\n", skt->sock);
         socket_shutdown(skt);
 }
 
@@ -641,8 +645,8 @@ static int pccardd(void *__skt)
         /* register with the device core */
         ret = device_register(&skt->dev);
         if (ret) {
-                printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n",
-                        skt);
+                dev_printk(KERN_WARNING, &skt->dev,
+                           "PCMCIA: unable to register socket\n");
                 skt->thread = NULL;
                 complete(&skt->thread_done);
                 return 0;
@@ -748,7 +752,7 @@ EXPORT_SYMBOL(pccard_register_pcmcia);
  * CIS register.
  */
 
-int pccard_reset_card(struct pcmcia_socket *skt)
+int pcmcia_reset_card(struct pcmcia_socket *skt)
 {
         int ret;
 
@@ -757,15 +761,15 @@ int pccard_reset_card(struct pcmcia_socket *skt)
         mutex_lock(&skt->skt_mutex);
         do {
                 if (!(skt->state & SOCKET_PRESENT)) {
-                        ret = CS_NO_CARD;
+                        ret = -ENODEV;
                         break;
                 }
                 if (skt->state & SOCKET_SUSPEND) {
-                        ret = CS_IN_USE;
+                        ret = -EBUSY;
                         break;
                 }
                 if (skt->state & SOCKET_CARDBUS) {
-                        ret = CS_UNSUPPORTED_FUNCTION;
+                        ret = -EPERM;
                         break;
                 }
 
@@ -774,20 +778,20 @@ int pccard_reset_card(struct pcmcia_socket *skt)
                         send_event(skt, CS_EVENT_RESET_PHYSICAL, CS_EVENT_PRI_LOW);
                         if (skt->callback)
                                 skt->callback->suspend(skt);
-                        if (socket_reset(skt) == CS_SUCCESS) {
+                        if (socket_reset(skt) == 0) {
                                 send_event(skt, CS_EVENT_CARD_RESET, CS_EVENT_PRI_LOW);
                                 if (skt->callback)
                                         skt->callback->resume(skt);
                         }
                 }
 
-                ret = CS_SUCCESS;
+                ret = 0;
         } while (0);
         mutex_unlock(&skt->skt_mutex);
 
         return ret;
 } /* reset_card */
-EXPORT_SYMBOL(pccard_reset_card);
+EXPORT_SYMBOL(pcmcia_reset_card);
 
 
 /* These shut down or wake up a socket.  They are sort of user
@@ -802,11 +806,11 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt)
         mutex_lock(&skt->skt_mutex);
         do {
                 if (!(skt->state & SOCKET_PRESENT)) {
-                        ret = CS_NO_CARD;
+                        ret = -ENODEV;
                         break;
                 }
                 if (skt->state & SOCKET_CARDBUS) {
-                        ret = CS_UNSUPPORTED_FUNCTION;
+                        ret = -EPERM;
                         break;
                 }
                 if (skt->callback) {
@@ -832,11 +836,11 @@ int pcmcia_resume_card(struct pcmcia_socket *skt)
         mutex_lock(&skt->skt_mutex);
         do {
                 if (!(skt->state & SOCKET_PRESENT)) {
-                        ret = CS_NO_CARD;
+                        ret = -ENODEV;
                         break;
                 }
                 if (skt->state & SOCKET_CARDBUS) {
-                        ret = CS_UNSUPPORTED_FUNCTION;
+                        ret = -EPERM;
                         break;
                 }
                 ret = socket_resume(skt);
@@ -892,7 +896,7 @@ int pcmcia_insert_card(struct pcmcia_socket *skt)
                         ret = -EBUSY;
                         break;
                 }
-                if (socket_insert(skt) == CS_NO_CARD) {
+                if (socket_insert(skt) == -ENODEV) {
                         ret = -ENODEV;
                         break;
                 }