Patched in Tegra support.

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 2e50f811ff5..68cd05b6d82 100644
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -30,7 +30,7 @@ void cb710_pci_update_config_reg(struct pci_dev *pdev,
 EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg);
 
 /* Some magic writes based on Windows driver init code */
-static int cb710_pci_configure(struct pci_dev *pdev)
+static int __devinit cb710_pci_configure(struct pci_dev *pdev)
 {
         unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
         struct pci_dev *pdev0;
@@ -96,7 +96,7 @@ static void cb710_release_slot(struct device *dev)
 #endif
 }
 
-static int cb710_register_slot(struct cb710_chip *chip,
+static int __devinit cb710_register_slot(struct cb710_chip *chip,
         unsigned slot_mask, unsigned io_offset, const char *name)
 {
         int nr = chip->slots;
@@ -180,7 +180,7 @@ static int cb710_suspend(struct pci_dev *pdev, pm_message_t state)
         pci_save_state(pdev);
         pci_disable_device(pdev);
         if (state.event & PM_EVENT_SLEEP)
-                pci_set_power_state(pdev, PCI_D3hot);
+                pci_set_power_state(pdev, PCI_D3cold);
         return 0;
 }
 
@@ -201,7 +201,7 @@ static int cb710_resume(struct pci_dev *pdev)
 
 #endif /* CONFIG_PM */
 
-static int cb710_probe(struct pci_dev *pdev,
+static int __devinit cb710_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         struct cb710_chip *chip;
@@ -245,7 +245,6 @@ static int cb710_probe(struct pci_dev *pdev,
         if (err)
                 return err;
 
-        spin_lock_init(&chip->irq_lock);
         chip->pdev = pdev;
         chip->iobase = pcim_iomap_table(pdev)[0];
 
@@ -305,7 +304,7 @@ unreg_mmc:
         return err;
 }
 
-static void cb710_remove_one(struct pci_dev *pdev)
+static void __devexit cb710_remove_one(struct pci_dev *pdev)
 {
         struct cb710_chip *chip = pci_get_drvdata(pdev);
         unsigned long flags;
@@ -332,7 +331,7 @@ static struct pci_driver cb710_driver = {
         .name = KBUILD_MODNAME,
         .id_table = cb710_pci_tbl,
         .probe = cb710_probe,
-        .remove = cb710_remove_one,
+        .remove = __devexit_p(cb710_remove_one),
 #ifdef CONFIG_PM
         .suspend = cb710_suspend,
         .resume = cb710_resume,