powerpc/mm: Drop the unnecessary region check

[linux-2.6-block.git] / drivers / hwtracing / coresight / coresight-etm3x.c

diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c
index 9a63e87ea5f3f5d647f1ab0caaf765629e6d41e5..be302ec5f66bdd0be912fa31b7c922d77bedd1fe 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm3x.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x.c
@@ -871,7 +871,7 @@ static int etm_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));
        if (boot_enable) {
                coresight_enable(drvdata->csdev);
                drvdata->boot_enable = true;
@@ -915,36 +915,18 @@ static const struct dev_pm_ops etm_dev_pm_ops = {
 };
 
 static const struct amba_id etm_ids[] = {
-       {       /* ETM 3.3 */
-               .id     = 0x000bb921,
-               .mask   = 0x000fffff,
-               .data   = "ETM 3.3",
-       },
-       {       /* ETM 3.5 - Cortex-A5 */
-               .id     = 0x000bb955,
-               .mask   = 0x000fffff,
-               .data   = "ETM 3.5",
-       },
-       {       /* ETM 3.5 */
-               .id     = 0x000bb956,
-               .mask   = 0x000fffff,
-               .data   = "ETM 3.5",
-       },
-       {       /* PTM 1.0 */
-               .id     = 0x000bb950,
-               .mask   = 0x000fffff,
-               .data   = "PTM 1.0",
-       },
-       {       /* PTM 1.1 */
-               .id     = 0x000bb95f,
-               .mask   = 0x000fffff,
-               .data   = "PTM 1.1",
-       },
-       {       /* PTM 1.1 Qualcomm */
-               .id     = 0x000b006f,
-               .mask   = 0x000fffff,
-               .data   = "PTM 1.1",
-       },
+       /* ETM 3.3 */
+       CS_AMBA_ID_DATA(0x000bb921, "ETM 3.3"),
+       /* ETM 3.5 - Cortex-A5 */
+       CS_AMBA_ID_DATA(0x000bb955, "ETM 3.5"),
+       /* ETM 3.5 */
+       CS_AMBA_ID_DATA(0x000bb956, "ETM 3.5"),
+       /* PTM 1.0 */
+       CS_AMBA_ID_DATA(0x000bb950, "PTM 1.0"),
+       /* PTM 1.1 */
+       CS_AMBA_ID_DATA(0x000bb95f, "PTM 1.1"),
+       /* PTM 1.1 Qualcomm */
+       CS_AMBA_ID_DATA(0x000b006f, "PTM 1.1"),
        { 0, 0},
 };