USB: option: use usb_{get,set}_serial_data

Use usb_{get,set}_serial_data to access usb-serial data.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 1aae9028cd0bd9e58a75461bbbceb74b9079f0b0..6cb40ec5253249d1bc18eaf740a56ebe2107dbc7 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1347,12 +1347,15 @@ static int option_probe(struct usb_serial *serial,
                serial->interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA)
                return -ENODEV;
 
-       data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
+       data = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
        data->send_setup = option_send_setup;
        spin_lock_init(&data->susp_lock);
        data->private = (void *)id->driver_info;
+
+       usb_set_serial_data(serial, data);
+
        return 0;
 }
 
@@ -1419,8 +1422,7 @@ static void option_instat_callback(struct urb *urb)
 static int option_send_setup(struct usb_serial_port *port)
 {
        struct usb_serial *serial = port->serial;
-       struct usb_wwan_intf_private *intfdata =
-               (struct usb_wwan_intf_private *) serial->private;
+       struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
        struct option_port_private *portdata;
        int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
        int val = 0;