diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 375d1443dc24..6cf5263f406f 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -4398,7 +4398,7 @@ class ComputeManager(manager.Manager):
                     context, instance.uuid))
 
             device_name = compute_utils.get_device_name_for_instance(
-                    context, instance, bdms, device)
+                    instance, bdms, device)
 
             # NOTE(vish): create bdm here to avoid race condition
             bdm = objects.BlockDeviceMapping(
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index 54102c425c53..0c3989ff9a5b 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -92,7 +92,7 @@ def add_instance_fault_from_exc(context, instance, fault, exc_info=None):
     fault_obj.create()
 
 
-def get_device_name_for_instance(context, instance, bdms, device):
+def get_device_name_for_instance(instance, bdms, device):
     """Validates (or generates) a device name for instance.
 
     This method is a wrapper for get_next_device_name that gets the list
diff --git a/nova/tests/unit/compute/test_compute_utils.py b/nova/tests/unit/compute/test_compute_utils.py
index 5babcac21752..143af51b9423 100644
--- a/nova/tests/unit/compute/test_compute_utils.py
+++ b/nova/tests/unit/compute/test_compute_utils.py
@@ -104,7 +104,7 @@ class ComputeValidateDeviceTestCase(test.NoDBTestCase):
         bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
                 self.context, self.instance['uuid'])
         return compute_utils.get_device_name_for_instance(
-                self.context, self.instance, bdms, device)
+            self.instance, bdms, device)
 
     @staticmethod
     def _fake_bdm(device):