1 files changed, 20 insertions, 12 deletions

diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index bf3e774c4dc..10202d0bc1c 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -111,7 +111,7 @@ static int nsc_wait_for_ready(struct tpm_chip *chip)
         }
         while (time_before(jiffies, stop));
 
-        dev_info(&chip->pci_dev->dev, "wait for ready failed\n");
+        dev_info(chip->dev, "wait for ready failed\n");
         return -EBUSY;
 }
 
@@ -127,12 +127,12 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
                 return -EIO;
 
         if (wait_for_stat(chip, NSC_STATUS_F0, NSC_STATUS_F0, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "F0 timeout\n");
+                dev_err(chip->dev, "F0 timeout\n");
                 return -EIO;
         }
         if ((data =
              inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_NORMAL) {
-                dev_err(&chip->pci_dev->dev, "not in normal mode (0x%x)\n",
+                dev_err(chip->dev, "not in normal mode (0x%x)\n",
                         data);
                 return -EIO;
         }
@@ -141,7 +141,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
         for (p = buffer; p < &buffer[count]; p++) {
                 if (wait_for_stat
                     (chip, NSC_STATUS_OBF, NSC_STATUS_OBF, &data) < 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                 "OBF timeout (while reading data)\n");
                         return -EIO;
                 }
@@ -152,11 +152,11 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
 
         if ((data & NSC_STATUS_F0) == 0 &&
         (wait_for_stat(chip, NSC_STATUS_F0, NSC_STATUS_F0, &data) < 0)) {
-                dev_err(&chip->pci_dev->dev, "F0 not set\n");
+                dev_err(chip->dev, "F0 not set\n");
                 return -EIO;
         }
         if ((data = inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_EOC) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                         "expected end of command(0x%x)\n", data);
                 return -EIO;
         }
@@ -187,19 +187,19 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
                 return -EIO;
 
         if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "IBF timeout\n");
+                dev_err(chip->dev, "IBF timeout\n");
                 return -EIO;
         }
 
         outb(NSC_COMMAND_NORMAL, chip->vendor->base + NSC_COMMAND);
         if (wait_for_stat(chip, NSC_STATUS_IBR, NSC_STATUS_IBR, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "IBR timeout\n");
+                dev_err(chip->dev, "IBR timeout\n");
                 return -EIO;
         }
 
         for (i = 0; i < count; i++) {
                 if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                 "IBF timeout (while writing data)\n");
                         return -EIO;
                 }
@@ -207,7 +207,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
         }
 
         if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "IBF timeout\n");
+                dev_err(chip->dev, "IBF timeout\n");
                 return -EIO;
         }
         outb(NSC_COMMAND_EOC, chip->vendor->base + NSC_COMMAND);
@@ -325,7 +325,7 @@ static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
         /* enable the DPM module */
         tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01);
 
-        if ((rc = tpm_register_hardware(pci_dev, &tpm_nsc)) < 0)
+        if ((rc = tpm_register_hardware(&pci_dev->dev, &tpm_nsc)) < 0)
                 goto out_err;
 
         return 0;
@@ -335,6 +335,14 @@ out_err:
         return rc;
 }
 
+static void __devexit tpm_nsc_remove(struct pci_dev *pci_dev)
+{
+        struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+
+        if ( chip )
+                tpm_remove_hardware(chip->dev);
+}
+
 static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
@@ -354,7 +362,7 @@ static struct pci_driver nsc_pci_driver = {
         .name = "tpm_nsc",
         .id_table = tpm_pci_tbl,
         .probe = tpm_nsc_init,
-        .remove = __devexit_p(tpm_remove),
+        .remove = __devexit_p(tpm_nsc_remove),
         .suspend = tpm_pm_suspend,
         .resume = tpm_pm_resume,
 };