Commit dabe5184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HSI updates from Sebastian Reichel:

 - spelling/typo fixes

 - remove extra error printing for -ENOMEM

* tag 'hsi-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: hsi_char: Delete an error message for a failed memory allocation in hsc_probe()
  HSI: ssi_protocol: fix spelling mistake: "trigerred" -> "triggered"
  HSI: ssi_protocol: Delete an error message for a failed memory allocation in ssi_protocol_probe()
  HSI: ssi_protocol: Fix a typo in two comment lines
parents 3ac684b8 e3d7fbab
...@@ -697,10 +697,9 @@ static int hsc_probe(struct device *dev) ...@@ -697,10 +697,9 @@ static int hsc_probe(struct device *dev)
int i; int i;
cl_data = kzalloc(sizeof(*cl_data), GFP_KERNEL); cl_data = kzalloc(sizeof(*cl_data), GFP_KERNEL);
if (!cl_data) { if (!cl_data)
dev_err(dev, "Could not allocate hsc_client_data\n");
return -ENOMEM; return -ENOMEM;
}
hsc_baseminor = HSC_BASEMINOR(hsi_id(cl), hsi_port_id(cl)); hsc_baseminor = HSC_BASEMINOR(hsi_id(cl), hsi_port_id(cl));
if (!hsc_major) { if (!hsc_major) {
ret = alloc_chrdev_region(&hsc_dev, hsc_baseminor, ret = alloc_chrdev_region(&hsc_dev, hsc_baseminor,
......
...@@ -495,7 +495,7 @@ static void ssip_rx_wd(struct timer_list *t) ...@@ -495,7 +495,7 @@ static void ssip_rx_wd(struct timer_list *t)
struct ssi_protocol *ssi = from_timer(ssi, t, rx_wd); struct ssi_protocol *ssi = from_timer(ssi, t, rx_wd);
struct hsi_client *cl = ssi->cl; struct hsi_client *cl = ssi->cl;
dev_err(&cl->device, "Watchdog trigerred\n"); dev_err(&cl->device, "Watchdog triggered\n");
ssip_error(cl); ssip_error(cl);
} }
...@@ -504,7 +504,7 @@ static void ssip_tx_wd(struct timer_list *t) ...@@ -504,7 +504,7 @@ static void ssip_tx_wd(struct timer_list *t)
struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd); struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd);
struct hsi_client *cl = ssi->cl; struct hsi_client *cl = ssi->cl;
dev_err(&cl->device, "Watchdog trigerred\n"); dev_err(&cl->device, "Watchdog triggered\n");
ssip_error(cl); ssip_error(cl);
} }
...@@ -993,8 +993,8 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -993,8 +993,8 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev)
goto inc_dropped; goto inc_dropped;
/* /*
* Modem sends Phonet messages over SSI with its own endianess... * Modem sends Phonet messages over SSI with its own endianness.
* Assume that modem has the same endianess as we do. * Assume that modem has the same endianness as we do.
*/ */
if (skb_cow_head(skb, 0)) if (skb_cow_head(skb, 0))
goto drop; goto drop;
...@@ -1088,10 +1088,8 @@ static int ssi_protocol_probe(struct device *dev) ...@@ -1088,10 +1088,8 @@ static int ssi_protocol_probe(struct device *dev)
int err; int err;
ssi = kzalloc(sizeof(*ssi), GFP_KERNEL); ssi = kzalloc(sizeof(*ssi), GFP_KERNEL);
if (!ssi) { if (!ssi)
dev_err(dev, "No memory for ssi protocol\n");
return -ENOMEM; return -ENOMEM;
}
spin_lock_init(&ssi->lock); spin_lock_init(&ssi->lock);
timer_setup(&ssi->rx_wd, ssip_rx_wd, TIMER_DEFERRABLE); timer_setup(&ssi->rx_wd, ssip_rx_wd, TIMER_DEFERRABLE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment