12 files changed, 64 insertions, 88 deletions

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 0c688232aab3..97467053a01b 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -297,7 +297,6 @@ static int __init bsr_init(void)
         struct device_node *np;
         dev_t bsr_dev;
         int ret = -ENODEV;
-        int result;
 
         np = of_find_compatible_node(NULL, NULL, "ibm,bsr");
         if (!np)
@@ -306,13 +305,14 @@ static int __init bsr_init(void)
         bsr_class = class_create(THIS_MODULE, "bsr");
         if (IS_ERR(bsr_class)) {
                 printk(KERN_ERR "class_create() failed for bsr_class\n");
+                ret = PTR_ERR(bsr_class);
                 goto out_err_1;
         }
         bsr_class->dev_attrs = bsr_dev_attrs;
 
-        result = alloc_chrdev_region(&bsr_dev, 0, BSR_MAX_DEVS, "bsr");
+        ret = alloc_chrdev_region(&bsr_dev, 0, BSR_MAX_DEVS, "bsr");
         bsr_major = MAJOR(bsr_dev);
-        if (result < 0) {
+        if (ret < 0) {
                 printk(KERN_ERR "alloc_chrdev_region() failed for bsr\n");
                 goto out_err_2;
         }
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 1412565c01af..d706bd0e9e80 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -162,22 +162,24 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_PM
 
-static int omap_rng_suspend(struct platform_device *pdev, pm_message_t message)
+static int omap_rng_suspend(struct device *dev)
 {
         omap_rng_write_reg(RNG_MASK_REG, 0x0);
         return 0;
 }
 
-static int omap_rng_resume(struct platform_device *pdev)
+static int omap_rng_resume(struct device *dev)
 {
         omap_rng_write_reg(RNG_MASK_REG, 0x1);
         return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(omap_rng_pm, omap_rng_suspend, omap_rng_resume);
+#define OMAP_RNG_PM     (&omap_rng_pm)
+
 #else
 
-#define omap_rng_suspend        NULL
-#define omap_rng_resume         NULL
+#define OMAP_RNG_PM     NULL
 
 #endif
 
@@ -188,11 +190,10 @@ static struct platform_driver omap_rng_driver = {
         .driver = {
                 .name           = "omap_rng",
                 .owner          = THIS_MODULE,
+                .pm             = OMAP_RNG_PM,
         },
         .probe          = omap_rng_probe,
         .remove         = __exit_p(omap_rng_remove),
-        .suspend        = omap_rng_suspend,
-        .resume         = omap_rng_resume
 };
 
 static int __init omap_rng_init(void)
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 1e638fff40ea..83f85cf7fb1b 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2503,18 +2503,6 @@ static void __devexit ipmi_pci_remove(struct pci_dev *pdev)
         cleanup_one_si(info);
 }
 
-#ifdef CONFIG_PM
-static int ipmi_pci_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        return 0;
-}
-
-static int ipmi_pci_resume(struct pci_dev *pdev)
-{
-        return 0;
-}
-#endif
-
 static struct pci_device_id ipmi_pci_devices[] = {
         { PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) },
         { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) },
@@ -2527,10 +2515,6 @@ static struct pci_driver ipmi_pci_driver = {
         .id_table =     ipmi_pci_devices,
         .probe =        ipmi_pci_probe,
         .remove =       __devexit_p(ipmi_pci_remove),
-#ifdef CONFIG_PM
-        .suspend =      ipmi_pci_suspend,
-        .resume =       ipmi_pci_resume,
-#endif
 };
 #endif /* CONFIG_PCI */
 
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 7ed356e52035..37b8be7cba95 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -141,17 +141,6 @@
 
 #define IPMI_WDOG_TIMER_NOT_INIT_RESP   0x80
 
-/* These are here until the real ones get into the watchdog.h interface. */
-#ifndef WDIOC_GETTIMEOUT
-#define WDIOC_GETTIMEOUT        _IOW(WATCHDOG_IOCTL_BASE, 20, int)
-#endif
-#ifndef WDIOC_SET_PRETIMEOUT
-#define WDIOC_SET_PRETIMEOUT     _IOW(WATCHDOG_IOCTL_BASE, 21, int)
-#endif
-#ifndef WDIOC_GET_PRETIMEOUT
-#define WDIOC_GET_PRETIMEOUT     _IOW(WATCHDOG_IOCTL_BASE, 22, int)
-#endif
-
 static DEFINE_MUTEX(ipmi_watchdog_mutex);
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
@@ -732,7 +721,6 @@ static int ipmi_ioctl(struct file *file,
                         return -EFAULT;
                 return 0;
 
-        case WDIOC_SET_PRETIMEOUT:
         case WDIOC_SETPRETIMEOUT:
                 i = copy_from_user(&val, argp, sizeof(int));
                 if (i)
@@ -740,7 +728,6 @@ static int ipmi_ioctl(struct file *file,
                 pretimeout = val;
                 return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
 
-        case WDIOC_GET_PRETIMEOUT:
         case WDIOC_GETPRETIMEOUT:
                 i = copy_to_user(argp, &pretimeout, sizeof(pretimeout));
                 if (i)
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 67c3371723cc..e5eedfa24c91 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -27,14 +27,16 @@
 #include <linux/splice.h>
 #include <linux/pfn.h>
 #include <linux/export.h>
+#include <linux/io.h>
 
 #include <asm/uaccess.h>
-#include <asm/io.h>
 
 #ifdef CONFIG_IA64
 # include <linux/efi.h>
 #endif
 
+#define DEVPORT_MINOR   4
+
 static inline unsigned long size_inside_page(unsigned long start,
                                              unsigned long size)
 {
@@ -894,6 +896,13 @@ static int __init chr_dev_init(void)
         for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
                 if (!devlist[minor].name)
                         continue;
+
+                /*
+                 * Create /dev/port? 
+                 */
+                if ((minor == DEVPORT_MINOR) && !arch_has_dev_port())
+                        continue;
+
                 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
                               NULL, devlist[minor].name);
         }
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 45713f0e7d61..f87780502b41 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1459,7 +1459,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
 #ifdef CONFIG_PM
 static int old_camera_power;
 
-static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
+static int sonypi_suspend(struct device *dev)
 {
         old_camera_power = sonypi_device.camera_power;
         sonypi_disable();
@@ -1467,14 +1467,16 @@ static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
         return 0;
 }
 
-static int sonypi_resume(struct platform_device *dev)
+static int sonypi_resume(struct device *dev)
 {
         sonypi_enable(old_camera_power);
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(sonypi_pm, sonypi_suspend, sonypi_resume);
+#define SONYPI_PM       (&sonypi_pm)
 #else
-#define sonypi_suspend  NULL
-#define sonypi_resume   NULL
+#define SONYPI_PM       NULL
 #endif
 
 static void sonypi_shutdown(struct platform_device *dev)
@@ -1486,12 +1488,11 @@ static struct platform_driver sonypi_driver = {
         .driver         = {
                 .name   = "sonypi",
                 .owner  = THIS_MODULE,
+                .pm     = SONYPI_PM,
         },
         .probe          = sonypi_probe,
         .remove         = __devexit_p(sonypi_remove),
         .shutdown       = sonypi_shutdown,
-        .suspend        = sonypi_suspend,
-        .resume         = sonypi_resume,
 };
 
 static struct platform_device *sonypi_platform_device;
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index ad7c7320dd1b..817f0ee202b6 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -827,10 +827,10 @@ EXPORT_SYMBOL_GPL(tpm_pcr_extend);
 int tpm_do_selftest(struct tpm_chip *chip)
 {
         int rc;
-        u8 digest[TPM_DIGEST_SIZE];
         unsigned int loops;
         unsigned int delay_msec = 1000;
         unsigned long duration;
+        struct tpm_cmd_t cmd;
 
         duration = tpm_calc_ordinal_duration(chip,
                                              TPM_ORD_CONTINUE_SELFTEST);
@@ -845,7 +845,15 @@ int tpm_do_selftest(struct tpm_chip *chip)
                 return rc;
 
         do {
-                rc = __tpm_pcr_read(chip, 0, digest);
+                /* Attempt to read a PCR value */
+                cmd.header.in = pcrread_header;
+                cmd.params.pcrread_in.pcr_idx = cpu_to_be32(0);
+                rc = tpm_transmit(chip, (u8 *) &cmd, READ_PCR_RESULT_SIZE);
+
+                if (rc < TPM_HEADER_SIZE)
+                        return -EFAULT;
+
+                rc = be32_to_cpu(cmd.header.out.return_code);
                 if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {
                         dev_info(chip->dev,
                                  "TPM is disabled/deactivated (0x%X)\n", rc);
@@ -1274,7 +1282,7 @@ static struct tpm_input_header savestate_header = {
  * We are about to suspend. Save the TPM state
  * so that it can be restored.
  */
-int tpm_pm_suspend(struct device *dev, pm_message_t pm_state)
+int tpm_pm_suspend(struct device *dev)
 {
         struct tpm_chip *chip = dev_get_drvdata(dev);
         struct tpm_cmd_t cmd;
@@ -1322,6 +1330,9 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume);
 
 void tpm_dev_vendor_release(struct tpm_chip *chip)
 {
+        if (!chip)
+                return;
+
         if (chip->vendor.release)
                 chip->vendor.release(chip->dev);
 
@@ -1339,6 +1350,9 @@ void tpm_dev_release(struct device *dev)
 {
         struct tpm_chip *chip = dev_get_drvdata(dev);
 
+        if (!chip)
+                return;
+
         tpm_dev_vendor_release(chip);
 
         chip->release(dev);
@@ -1405,15 +1419,12 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
                         "unable to misc_register %s, minor %d\n",
                         chip->vendor.miscdev.name,
                         chip->vendor.miscdev.minor);
-                put_device(chip->dev);
-                return NULL;
+                goto put_device;
         }
 
         if (sysfs_create_group(&dev->kobj, chip->vendor.attr_group)) {
                 misc_deregister(&chip->vendor.miscdev);
-                put_device(chip->dev);
-
-                return NULL;
+                goto put_device;
         }
 
         chip->bios_dir = tpm_bios_log_setup(devname);
@@ -1425,6 +1436,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
 
         return chip;
 
+put_device:
+        put_device(chip->dev);
 out_free:
         kfree(chip);
         kfree(devname);
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index b1c5280ac159..917f727e6740 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -299,7 +299,7 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t,
                          loff_t *);
 extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
 extern void tpm_remove_hardware(struct device *);
-extern int tpm_pm_suspend(struct device *, pm_message_t);
+extern int tpm_pm_suspend(struct device *);
 extern int tpm_pm_resume(struct device *);
 extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long,
                              wait_queue_head_t *);
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index c64a1bc65349..678d57019dc4 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -168,22 +168,14 @@ static void atml_plat_remove(void)
         }
 }
 
-static int tpm_atml_suspend(struct platform_device *dev, pm_message_t msg)
-{
-        return tpm_pm_suspend(&dev->dev, msg);
-}
+static SIMPLE_DEV_PM_OPS(tpm_atml_pm, tpm_pm_suspend, tpm_pm_resume);
 
-static int tpm_atml_resume(struct platform_device *dev)
-{
-        return tpm_pm_resume(&dev->dev);
-}
 static struct platform_driver atml_drv = {
         .driver = {
                 .name = "tpm_atmel",
                 .owner          = THIS_MODULE,
+                .pm             = &tpm_atml_pm,
         },
-        .suspend = tpm_atml_suspend,
-        .resume = tpm_atml_resume,
 };
 
 static int __init init_atmel(void)
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 76da32e11f18..3251a44e8ceb 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -4,8 +4,8 @@
  * SLD 9630 TT 1.1 and SLB 9635 TT 1.2 Trusted Platform Module
  * Specifications at www.trustedcomputinggroup.org
  *
- * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com>
- * Sirrix AG - security technologies, http://www.sirrix.com and
+ * Copyright (C) 2005, Marcel Selhorst <tpmdd@selhorst.net>
+ * Sirrix AG - security technologies <tpmdd@sirrix.com> and
  * Applied Data Security Group, Ruhr-University Bochum, Germany
  * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ 
  *
@@ -671,7 +671,7 @@ static void __exit cleanup_inf(void)
 module_init(init_inf);
 module_exit(cleanup_inf);
 
-MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>");
+MODULE_AUTHOR("Marcel Selhorst <tpmdd@sirrix.com>");
 MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");
 MODULE_VERSION("1.9.2");
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index 4d2464871ada..640c9a427b59 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -274,22 +274,13 @@ static void tpm_nsc_remove(struct device *dev)
         }
 }
 
-static int tpm_nsc_suspend(struct platform_device *dev, pm_message_t msg)
-{
-        return tpm_pm_suspend(&dev->dev, msg);
-}
-
-static int tpm_nsc_resume(struct platform_device *dev)
-{
-        return tpm_pm_resume(&dev->dev);
-}
+static SIMPLE_DEV_PM_OPS(tpm_nsc_pm, tpm_pm_suspend, tpm_pm_resume);
 
 static struct platform_driver nsc_drv = {
-        .suspend         = tpm_nsc_suspend,
-        .resume          = tpm_nsc_resume,
         .driver          = {
                 .name    = "tpm_nsc",
                 .owner   = THIS_MODULE,
+                .pm      = &tpm_nsc_pm,
         },
 };
 
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index d2a70cae76df..89682fa8801e 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -750,7 +750,7 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
 
 static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)
 {
-        return tpm_pm_suspend(&dev->dev, msg);
+        return tpm_pm_suspend(&dev->dev);
 }
 
 static int tpm_tis_pnp_resume(struct pnp_dev *dev)
@@ -806,27 +806,25 @@ module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,
                     sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);
 MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");
 #endif
-static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg)
-{
-        return tpm_pm_suspend(&dev->dev, msg);
-}
 
-static int tpm_tis_resume(struct platform_device *dev)
+static int tpm_tis_resume(struct device *dev)
 {
-        struct tpm_chip *chip = dev_get_drvdata(&dev->dev);
+        struct tpm_chip *chip = dev_get_drvdata(dev);
 
         if (chip->vendor.irq)
                 tpm_tis_reenable_interrupts(chip);
 
-        return tpm_pm_resume(&dev->dev);
+        return tpm_pm_resume(dev);
 }
+
+static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
+
 static struct platform_driver tis_drv = {
         .driver = {
                 .name = "tpm_tis",
                 .owner          = THIS_MODULE,
+                .pm             = &tpm_tis_pm,
         },
-        .suspend = tpm_tis_suspend,
-        .resume = tpm_tis_resume,
 };
 
 static struct platform_device *pdev;