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

Pull HSI changes from Sebastian Reichel:
 "Misc fixes in SSI related drivers"

* tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()
  HSI: omap_ssi_port: Fix return value check in ssi_debug_add_port()
  HSI: ssi_protocol: Fix sparse non static symbol warning
  drivers/hsi/controllers/omap_ssi{,_port}.c: fix failure checks

diff --combined drivers/hsi/clients/ssi_protocol.c
index 737fa2e,fe364a3..e5c7a96
--- 1/drivers/hsi/clients/ssi_protocol.c
--- 2/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@@ -901,7 -901,7 +901,7 @@@ out
        ssip_free_data(msg);
  }
  
- void ssip_port_event(struct hsi_client *cl, unsigned long event)
+ static void ssip_port_event(struct hsi_client *cl, unsigned long event)
  {
        switch (event) {
        case HSI_EVENT_START_RX:
@@@ -1115,7 -1115,7 +1115,7 @@@ static int ssi_protocol_probe(struct de
                goto out;
        }
  
 -      ssi->netdev = alloc_netdev(0, ifname, ssip_pn_setup);
 +      ssi->netdev = alloc_netdev(0, ifname, NET_NAME_UNKNOWN, ssip_pn_setup);
        if (!ssi->netdev) {
                dev_err(dev, "No memory for netdev\n");
                err = -ENOMEM;