fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / pcmcia / i82092.c

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index f3fdc74..c2ea07a 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -42,6 +41,7 @@ static struct pci_device_id i82092aa_pci_ids[] = {
 };
 MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
 
+#ifdef CONFIG_PM
 static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state)
 {
        return pcmcia_socket_dev_suspend(&dev->dev, state);
@@ -51,14 +51,17 @@ static int i82092aa_socket_resume (struct pci_dev *dev)
 {
        return pcmcia_socket_dev_resume(&dev->dev);
 }
+#endif
 
 static struct pci_driver i82092aa_pci_drv = {
        .name           = "i82092aa",
        .id_table       = i82092aa_pci_ids,
        .probe          = i82092aa_pci_probe,
        .remove         = __devexit_p(i82092aa_pci_remove),
+#ifdef CONFIG_PM
        .suspend        = i82092aa_socket_suspend,
        .resume         = i82092aa_socket_resume,
+#endif
 };
 
 
@@ -66,7 +69,6 @@ static struct pci_driver i82092aa_pci_drv = {
 static struct pccard_operations i82092aa_operations = {
        .init                   = i82092aa_init,
        .get_status             = i82092aa_get_status,
-       .get_socket             = i82092aa_get_socket,
        .set_socket             = i82092aa_set_socket,
        .set_io_map             = i82092aa_set_io_map,
        .set_mem_map            = i82092aa_set_mem_map,
@@ -151,7 +153,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de
 
        /* Register the interrupt handler */
        dprintk(KERN_DEBUG "Requesting interrupt %i \n",dev->irq);
-       if ((ret = request_irq(dev->irq, i82092aa_interrupt, SA_SHIRQ, "i82092aa", i82092aa_interrupt))) {
+       if ((ret = request_irq(dev->irq, i82092aa_interrupt, IRQF_SHARED, "i82092aa", i82092aa_interrupt))) {
                printk(KERN_ERR "i82092aa: Failed to register IRQ %d, aborting\n", dev->irq);
                goto err_out_free_res;
        }
@@ -317,7 +319,7 @@ static int to_cycles(int ns)
 
 /* Interrupt handler functionality */
 
-static irqreturn_t i82092aa_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t i82092aa_interrupt(int irq, void *dev)
 {
        int i;
        int loopcount = 0;
@@ -482,78 +484,6 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)
 }
 
 
-static int i82092aa_get_socket(struct pcmcia_socket *socket, socket_state_t *state) 
-{
-       unsigned int sock = container_of(socket, struct socket_info, socket)->number;
-       unsigned char reg,vcc,vpp;
-       
-       enter("i82092aa_get_socket");
-       state->flags    = 0;
-       state->Vcc      = 0;
-       state->Vpp      = 0;
-       state->io_irq   = 0;
-       state->csc_mask = 0;
-
-       /* First the power status of the socket */
-       reg = indirect_read(sock,I365_POWER); /* PCTRL - Power Control Register */
-
-       if (reg & I365_PWR_AUTO)
-               state->flags |= SS_PWR_AUTO;  /* Automatic Power Switch */
-               
-       if (reg & I365_PWR_OUT)
-               state->flags |= SS_OUTPUT_ENA; /* Output signals are enabled */
-               
-       vcc = reg & I365_VCC_MASK;    vpp = reg & I365_VPP1_MASK;
-       
-       if (reg & I365_VCC_5V) { /* Can still be 3.3V, in this case the Vcc value will be overwritten later */
-               state->Vcc = 50;
-               
-               if (vpp == I365_VPP1_5V)
-                       state->Vpp = 50;
-               if (vpp == I365_VPP1_12V)
-                       state->Vpp = 120;
-                       
-       }
-       
-       if ((reg & I365_VCC_3V)==I365_VCC_3V)
-               state->Vcc = 33;
-       
-       
-       /* Now the IO card, RESET flags and IO interrupt */
-       
-       reg = indirect_read(sock, I365_INTCTL); /* IGENC, Interrupt and General Control */
-       
-       if ((reg & I365_PC_RESET)==0)
-               state->flags |= SS_RESET;
-       if (reg & I365_PC_IOCARD) 
-               state->flags |= SS_IOCARD; /* This is an IO card */
-       
-       /* Set the IRQ number */
-       if (sockets[sock].dev!=NULL)
-               state->io_irq = sockets[sock].dev->irq;
-       
-       /* Card status change */
-       reg = indirect_read(sock, I365_CSCINT); /* CSCICR, Card Status Change Interrupt Configuration */
-       
-       if (reg & I365_CSC_DETECT) 
-               state->csc_mask |= SS_DETECT; /* Card detect is enabled */
-       
-       if (state->flags & SS_IOCARD) {/* IO Cards behave different */
-               if (reg & I365_CSC_STSCHG)
-                       state->csc_mask |= SS_STSCHG;
-       } else {
-               if (reg & I365_CSC_BVD1) 
-                       state->csc_mask |= SS_BATDEAD;
-               if (reg & I365_CSC_BVD2) 
-                       state->csc_mask |= SS_BATWARN;
-               if (reg & I365_CSC_READY) 
-                       state->csc_mask |= SS_READY;
-       }
-               
-       leave("i82092aa_get_socket");
-       return 0;
-}
-
 static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *state) 
 {
        unsigned int sock = container_of(socket, struct socket_info, socket)->number;
@@ -779,10 +709,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
 
 static int i82092aa_module_init(void)
 {
-       enter("i82092aa_module_init");
-       pci_register_driver(&i82092aa_pci_drv);
-       leave("i82092aa_module_init");
-       return 0;
+       return pci_register_driver(&i82092aa_pci_drv);
 }
 
 static void i82092aa_module_exit(void)