Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / drivers / hwtracing / coresight / coresight-funnel.c

diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index fb2c679fbc443faaf9fdd1debb8baec2bb78376b..05df789056ccfc823a103d3bc070bef1eaf46d85 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -1,4 +1,6 @@
 /* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
+ *
+ * Description: CoreSight Funnel driver
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -11,7 +13,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/device.h>
@@ -220,7 +221,6 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id)
        if (IS_ERR(drvdata->csdev))
                return PTR_ERR(drvdata->csdev);
 
-       dev_info(dev, "FUNNEL initialized\n");
        return 0;
 }
 
@@ -268,8 +268,4 @@ static struct amba_driver funnel_driver = {
        .probe          = funnel_probe,
        .id_table       = funnel_ids,
 };
-
-module_amba_driver(funnel_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("CoreSight Funnel driver");
+builtin_amba_driver(funnel_driver);