driver/openocddriver: unconditionally configure USB location

It seems that in some cases, the catch and error message command causes the
error 'extra characters after close-brace' in OpenOCD. As this feature is
contained in 0.11.0-rc1 (published 2020-12-09) and the command will trigger an
error if the support is missing, we can drop the special handling here.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Author: jluebbe

labgrid/driver/openocddriver.py

@@ -63,15 +63,8 @@ def __attrs_post_init__(self):
                 self.search = [self.search]
 
     def _get_usb_path_cmd(self):
-        # OpenOCD supports "adapter usb location" since a1b308ab, if the command is not known
-        # notice user and continue
-        message = ("Your OpenOCD version does not support specifying USB paths.\n"
-                   "Consider updating to OpenOCD v0.11 when using multiple USB Blasters.")
-        return [
-            "--command",
-            "'if {{ [catch {{adapter usb location \"{usbpath}\"}}] }} {{ puts stderr \"{msg}\" }}'"
-            .format(usbpath=self.interface.path, msg=message)
-        ]
+        # OpenOCD supports "adapter usb location" since a1b308ab, released with 0.11.0-rc1
+        return ["--command", f"'adapter usb location \"{self.interface.path}\"'"]
 
     def _run_commands(self, commands: list):
         cmd = self.interface.command_prefix+[self.tool]