usb: remove use of __devexit

[linux-2.6-block.git] / drivers / usb / gadget / net2272.c

diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c
index 43ac7482fa9184dbd4748d42d6a6008e21f330ef..d226058e3b88ab7a3f6d07783886d8f23e8b7365 100644 (file)
--- a/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/net2272.c
@@ -2069,8 +2069,10 @@ static irqreturn_t net2272_irq(int irq, void *_dev)
 #if defined(PLX_PCI_RDK2)
        /* see if PCI int for us by checking irqstat */
        intcsr = readl(dev->rdk2.fpga_base_addr + RDK2_IRQSTAT);
-       if (!intcsr & (1 << NET2272_PCI_IRQ))
+       if (!intcsr & (1 << NET2272_PCI_IRQ)) {
+               spin_unlock(&dev->lock);
                return IRQ_NONE;
+       }
        /* check dma interrupts */
 #endif
        /* Platform/devcice interrupt handler */
@@ -2191,7 +2193,7 @@ net2272_gadget_release(struct device *_dev)
 
 /*---------------------------------------------------------------------------*/
 
-static void __devexit
+static void
 net2272_remove(struct net2272 *dev)
 {
        usb_del_gadget_udc(&dev->gadget);
@@ -2213,8 +2215,7 @@ net2272_remove(struct net2272 *dev)
        dev_info(dev->dev, "unbind\n");
 }
 
-static struct net2272 * __devinit
-net2272_probe_init(struct device *dev, unsigned int irq)
+static struct net2272 *net2272_probe_init(struct device *dev, unsigned int irq)
 {
        struct net2272 *ret;
 
@@ -2244,7 +2245,7 @@ net2272_probe_init(struct device *dev, unsigned int irq)
        return ret;
 }
 
-static int __devinit
+static int
 net2272_probe_fin(struct net2272 *dev, unsigned int irqflags)
 {
        int ret;
@@ -2304,7 +2305,7 @@ err_add_udc:
  * don't respond over USB until a gadget driver binds to us
  */
 
-static int __devinit
+static int
 net2272_rdk1_probe(struct pci_dev *pdev, struct net2272 *dev)
 {
        unsigned long resource, len, tmp;
@@ -2387,7 +2388,7 @@ net2272_rdk1_probe(struct pci_dev *pdev, struct net2272 *dev)
        return ret;
 }
 
-static int __devinit
+static int
 net2272_rdk2_probe(struct pci_dev *pdev, struct net2272 *dev)
 {
        unsigned long resource, len;
@@ -2445,7 +2446,7 @@ net2272_rdk2_probe(struct pci_dev *pdev, struct net2272 *dev)
        return ret;
 }
 
-static int __devinit
+static int
 net2272_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct net2272 *dev;
@@ -2487,7 +2488,7 @@ net2272_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        return ret;
 }
 
-static void __devexit
+static void
 net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev)
 {
        int i;
@@ -2509,7 +2510,7 @@ net2272_rdk1_remove(struct pci_dev *pdev, struct net2272 *dev)
        }
 }
 
-static void __devexit
+static void
 net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev)
 {
        int i;
@@ -2528,7 +2529,7 @@ net2272_rdk2_remove(struct pci_dev *pdev, struct net2272 *dev)
                        pci_resource_len(pdev, i));
 }
 
-static void __devexit
+static void
 net2272_pci_remove(struct pci_dev *pdev)
 {
        struct net2272 *dev = pci_get_drvdata(pdev);
@@ -2547,7 +2548,7 @@ net2272_pci_remove(struct pci_dev *pdev)
 }
 
 /* Table of matching PCI IDs */
-static struct pci_device_id __devinitdata pci_ids[] = {
+static struct pci_device_id pci_ids[] = {
        {       /* RDK 1 card */
                .class       = ((PCI_CLASS_BRIDGE_OTHER << 8) | 0xfe),
                .class_mask  = 0,
@@ -2573,7 +2574,7 @@ static struct pci_driver net2272_pci_driver = {
        .id_table = pci_ids,
 
        .probe    = net2272_pci_probe,
-       .remove   = __devexit_p(net2272_pci_remove),
+       .remove   = net2272_pci_remove,
 };
 
 static int net2272_pci_register(void)
@@ -2593,7 +2594,7 @@ static inline void net2272_pci_unregister(void) { }
 
 /*---------------------------------------------------------------------------*/
 
-static int __devinit
+static int
 net2272_plat_probe(struct platform_device *pdev)
 {
        struct net2272 *dev;
@@ -2659,7 +2660,7 @@ net2272_plat_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit
+static int
 net2272_plat_remove(struct platform_device *pdev)
 {
        struct net2272 *dev = platform_get_drvdata(pdev);
@@ -2676,7 +2677,7 @@ net2272_plat_remove(struct platform_device *pdev)
 
 static struct platform_driver net2272_plat_driver = {
        .probe   = net2272_plat_probe,
-       .remove  = __devexit_p(net2272_plat_remove),
+       .remove  = net2272_plat_remove,
        .driver  = {
                .name  = driver_name,
                .owner = THIS_MODULE,