Merge tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI update from Sebastian Reichel:
 "Misc fixes in omap-ssi and nokia-modem drivers"

* tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: nokia-modem: fix error handling of irq_of_parse_and_map
  HSI: nokia-modem: setup default value for pm parameter
  HSI: omap_ssi_port: Don't print uninitialized err
  HSI: remove deprecated IRQF_DISABLED

diff --combined drivers/hsi/controllers/omap_ssi_port.c
index 1314ab8,7e31ecc..1f8652b
--- 1/drivers/hsi/controllers/omap_ssi_port.c
--- 2/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@@ -1118,8 -1118,7 +1118,7 @@@ static int __init ssi_port_probe(struc
        dev_dbg(&pd->dev, "init ssi port...\n");
  
        if (!try_module_get(ssi->owner)) {
-               dev_err(&pd->dev, "could not increment parent module refcount (err=%d)\n",
-                       err);
+               dev_err(&pd->dev, "could not increment parent module refcount\n");
                return -ENODEV;
        }
  
@@@ -1260,7 -1259,7 +1259,7 @@@ static int __exit ssi_port_remove(struc
        return 0;
  }
  
 -#ifdef CONFIG_PM_RUNTIME
 +#ifdef CONFIG_PM
  static int ssi_save_port_ctx(struct omap_ssi_port *omap_port)
  {
        struct hsi_port *port = to_hsi_port(omap_port->dev);
@@@ -1385,6 -1384,7 +1384,6 @@@ static struct platform_driver ssi_port_
        .remove = __exit_p(ssi_port_remove),
        .driver = {
                .name   = "omap_ssi_port",
 -              .owner  = THIS_MODULE,
                .of_match_table = omap_ssi_port_of_match,
                .pm     = DEV_PM_OPS,
        },