MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static struct workqueue_struct *ixgbe_wq;
+
 static bool ixgbe_check_cfg_remove(struct ixgbe_hw *hw, struct pci_dev *pdev);
 
 static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
        if (!test_bit(__IXGBE_DOWN, &adapter->state) &&
            !test_bit(__IXGBE_REMOVING, &adapter->state) &&
            !test_and_set_bit(__IXGBE_SERVICE_SCHED, &adapter->state))
-               schedule_work(&adapter->service_task);
+               queue_work(ixgbe_wq, &adapter->service_task);
 }
 
 static void ixgbe_remove_adapter(struct ixgbe_hw *hw)
        pr_info("%s - version %s\n", ixgbe_driver_string, ixgbe_driver_version);
        pr_info("%s\n", ixgbe_copyright);
 
+       ixgbe_wq = create_singlethread_workqueue(ixgbe_driver_name);
+       if (!ixgbe_wq) {
+               pr_err("%s: Failed to create workqueue\n", ixgbe_driver_name);
+               return -ENOMEM;
+       }
+
        ixgbe_dbg_init();
 
        ret = pci_register_driver(&ixgbe_driver);
        pci_unregister_driver(&ixgbe_driver);
 
        ixgbe_dbg_exit();
+       if (ixgbe_wq) {
+               destroy_workqueue(ixgbe_wq);
+               ixgbe_wq = NULL;
+       }
 }
 
 #ifdef CONFIG_IXGBE_DCA