staging: most: hdm-usb: Use setup_timer

[deliverable/linux.git] / drivers / staging / most / hdm-usb / hdm_usb.c

diff --git a/drivers/staging/most/hdm-usb/hdm_usb.c b/drivers/staging/most/hdm-usb/hdm_usb.c
index 747d22eabf97bdad74ffa92fd8a8aee63d05c776..41690f801fb8c6af9ebf636da98b4128241c9970 100644 (file)
--- a/drivers/staging/most/hdm-usb/hdm_usb.c
+++ b/drivers/staging/most/hdm-usb/hdm_usb.c
@@ -1239,11 +1239,10 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
        num_endpoints = usb_iface_desc->desc.bNumEndpoints;
        mutex_init(&mdev->io_mutex);
        INIT_WORK(&mdev->poll_work_obj, wq_netinfo);
-       init_timer(&mdev->link_stat_timer);
+       setup_timer(&mdev->link_stat_timer, link_stat_timer_handler,
+                   (unsigned long)mdev);
 
        mdev->usb_device = usb_dev;
-       mdev->link_stat_timer.function = link_stat_timer_handler;
-       mdev->link_stat_timer.data = (unsigned long)mdev;
        mdev->link_stat_timer.expires = jiffies + (2 * HZ);
 
        mdev->iface.mod = hdm_usb_fops.owner;
@@ -1417,7 +1416,7 @@ static int __init hdm_usb_init(void)
                return -EIO;
        }
        schedule_usb_work = create_workqueue("hdmu_work");
-       if (schedule_usb_work == NULL) {
+       if (!schedule_usb_work) {
                pr_err("could not create workqueue\n");
                usb_deregister(&hdm_usb);
                return -ENOMEM;