From 4d85fae04f23ebbdbbb11061b8eec48082ecdc43 Mon Sep 17 00:00:00 2001 From: Andor Daam Date: Mon, 5 Dec 2011 10:09:25 +0100 Subject: Staging: line6/midi.c: Fixed call of obsolete function strict_strtoul The function strict_strtoul is obsolete and should be replaced by the new kstrto* functions. The variable midi_mask_transmit is only used as unsigned short and the datatypes of all affected variables were adjusted accordingly. Signed-off-by: Andor Daam Signed-off-by: Greg Kroah-Hartman --- drivers/staging/line6/midi.c | 4 ++-- drivers/staging/line6/midi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c index 7f1e90e..3d1ada6 100644 --- a/drivers/staging/line6/midi.c +++ b/drivers/staging/line6/midi.c @@ -307,10 +307,10 @@ static ssize_t midi_set_midi_mask_transmit(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 b73a025..2c0a663 100644 --- a/drivers/staging/line6/midi.h +++ b/drivers/staging/line6/midi.h @@ -57,7 +57,7 @@ struct snd_line6_midi { /** Bit mask for output MIDI channels. */ - int midi_mask_transmit; + unsigned short midi_mask_transmit; /** Bit mask for input MIDI channels. -- cgit v1.1