[PATCH 2/2 v2] Staging: line6/midi.c: Fixed call of obsolete function strict_strtoul

Andor Daam andor.daam at googlemail.com
Fri Dec 2 11:15:24 UTC 2011


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 <andor.daam at googlemail.com>
---
 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 4163072..d01c2fd 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 2c0a663..4a9e9f9 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.



More information about the devel mailing list