coresight: etb: Allow etb to be built as a module

[linux-2.6-microblaze.git] / drivers / hwtracing / coresight / coresight-etb10.c

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c
index 03e3f25..248cc82 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etb10.c
+++ b/drivers/hwtracing/coresight/coresight-etb10.c
@@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,
 
        cur = buf->cur;
        offset = buf->offset;
-       barrier = barrier_pkt;
+       barrier = coresight_barrier_pkt;
 
        for (i = 0; i < to_read; i += 4) {
                buf_ptr = buf->data_pages[cur] + offset;
@@ -801,6 +801,21 @@ err_misc_register:
        return ret;
 }
 
+static int __exit etb_remove(struct amba_device *adev)
+{
+       struct etb_drvdata *drvdata = dev_get_drvdata(&adev->dev);
+
+       /*
+        * Since misc_open() holds a refcount on the f_ops, which is
+        * etb fops in this case, device is there until last file
+        * handler to this device is closed.
+        */
+       misc_deregister(&drvdata->miscdev);
+       coresight_unregister(drvdata->csdev);
+
+       return 0;
+}
+
 #ifdef CONFIG_PM
 static int etb_runtime_suspend(struct device *dev)
 {
@@ -835,6 +850,8 @@ static const struct amba_id etb_ids[] = {
        { 0, 0},
 };
 
+MODULE_DEVICE_TABLE(amba, etb_ids);
+
 static struct amba_driver etb_driver = {
        .drv = {
                .name   = "coresight-etb10",
@@ -844,6 +861,13 @@ static struct amba_driver etb_driver = {
 
        },
        .probe          = etb_probe,
+       .remove         = etb_remove,
        .id_table       = etb_ids,
 };
-builtin_amba_driver(etb_driver);
+
+module_amba_driver(etb_driver);
+
+MODULE_AUTHOR("Pratik Patel <pratikp@codeaurora.org>");
+MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>");
+MODULE_DESCRIPTION("Arm CoreSight Embedded Trace Buffer driver");
+MODULE_LICENSE("GPL v2");