Merge tag 'sound-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / drivers / hwtracing / coresight / coresight-stm.c

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index f07825df5c7a9a5119131048c71496a76ef381e6..9f8a844ed7aa304a40ab2b57750d9b8b1462b05d 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -870,7 +870,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
 
        pm_runtime_put(&adev->dev);
 
-       dev_info(dev, "%s initialized\n", (char *)id->data);
+       dev_info(dev, "%s initialized\n", (char *)coresight_get_uci_data(id));
        return 0;
 
 stm_unregister:
@@ -905,16 +905,8 @@ static const struct dev_pm_ops stm_dev_pm_ops = {
 };
 
 static const struct amba_id stm_ids[] = {
-       {
-               .id     = 0x000bb962,
-               .mask   = 0x000fffff,
-               .data   = "STM32",
-       },
-       {
-               .id     = 0x000bb963,
-               .mask   = 0x000fffff,
-               .data   = "STM500",
-       },
+       CS_AMBA_ID_DATA(0x000bb962, "STM32"),
+       CS_AMBA_ID_DATA(0x000bb963, "STM500"),
        { 0, 0},
 };