From: Andor Daam Date: Mon, 5 Dec 2011 09:10:37 +0000 (+0100) Subject: Staging: line6/midi.c: Fixed call of obsolete function strict_strtoul X-Git-Tag: firefly_0821_release~3680^2~3804^2~101^2~35 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=251c3948808046c39359658fa2faffff45b825d3;p=firefly-linux-kernel-4.4.55.git Staging: line6/midi.c: Fixed call of obsolete function strict_strtoul The obsolete function strict_strtoul should be replaced by the kstrto* functions. In this context kstrtou16 should be use, as midi_mask_receive is only used as unsigned short. All corresponding datatypes were adapted accordingly. Signed-off-by: Andor Daam Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c index 3d1ada68c29d..3013fb522bde 100644 --- a/drivers/staging/line6/midi.c +++ b/drivers/staging/line6/midi.c @@ -339,10 +339,10 @@ static ssize_t midi_set_midi_mask_receive(struct device *dev, { struct usb_interface *interface = to_usb_interface(dev); struct usb_line6 *line6 = usb_get_intfdata(interface); - unsigned long value; + unsigned short value; int ret; - ret = strict_strtoul(buf, 10, &value); + ret = kstrtou16(buf, 10, &value); if (ret) return ret; diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h index 2c0a66343ca5..4a9e9f947297 100644 --- a/drivers/staging/line6/midi.h +++ b/drivers/staging/line6/midi.h @@ -62,7 +62,7 @@ struct snd_line6_midi { /** Bit mask for input MIDI channels. */ - int midi_mask_receive; + unsigned short midi_mask_receive; /** Buffer for incoming MIDI stream.