UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

HSI changes for the v4.17 series 

* spelling/typo fixes
 * remove extra error printing for -ENOMEM
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAlrCZrcACgkQ2O7X88g7
 +powuA/+J28nj0euC6sFyJqaUYjFZQKfZCA+asdtFUmpihrjk5BqGVOdT7255w3z
 6devZAn68xvFv8WvvTlH4/aUHzZFxpZIXCFiZSokjnKvebzR7fAcauKaRrp96/3j
 7kcTgFmWn8TVvXSm7RhrhpWc5HO4sv/to1Ul8QchrX8HapXADzvZpU2EZWYBdTZN
 fkWV/HzKaScm+QeT3JJycmpYrQMoEXpHXqO2SBHCUBu77ArQhAlFeB9KMb6jD9BO
 b3zQlPS592lZfhyxq0894hHSnwtp8nqZjpsE/oQ0DIOxClhjcxucGWAcT+M0unEr
 1ViyZbtlBmd/ZjLSN7BVcELhr8THHJYLy+hwxb7xT+tDPExpBey2FwHehDseEQ5N
 +NaO3HxBTcv536ZF+X2YYr+bdQpoRDLvnguFUBCVyw9GTd+GRhFbJiNIVZuUemXG
 9N+XMineaJGR4/8pBGCQt2Ty62l137JoZlCR7Xq8Sysi01Pe/LY86CLFa9xqkF3g
 wqZPCfLraXKKreIvQl+serQgS7m5JozvjFoq+zIo+DXhZVwK87UcFkOdfQf6REwZ
 VVNIObYjOTFRRKHclUWIkgcpudi/LI518saQY3MAJ4hZsUoXJhuV2IA/LHm1xrS4
 WKGTSgysMXha6cKf7SqCoE1aqq3T0q3T1Tl8v1Dp22mWCnyqLRs=
 =Flbh
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2018-04-03 12:14:54 -07:00
parent 3ac684b881 e3d7fbab06
commit dabe51840e
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hsi/clients/hsi_char.c
View File

@ -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,

12
drivers/hsi/clients/ssi_protocol.c
View File

@ -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)
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)
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)
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);