video: tegra: host: init static keys when lock debugging is enabled

Fixed the warning messages from lockdep_init_map()

Bug 1048760

Reviewed on: http://git-master/r/140882
(cherry-picked from commit I651800826d1aa849c8aa51f18a52712d66fa2e35)

Change-Id: I4c5707cdc252e23b78772eab857f2afac8d80581
Signed-off-by: Emma Yan <eyan@nvidia.com>
Reviewed-on: http://git-master/r/192772
(cherry picked from commit a9724a0344c9bd777aabb478dfdff66a7db30841)
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/201628
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index 0e751100230fd199710883978851ade96d6040b5..41e7772647a593526c9eeb2ed9695bb5ebf07b81 100644 (file)
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -488,6 +488,7 @@ int nvhost_module_init(struct platform_device *dev)
        attr->attr.mode = S_IWUSR | S_IRUGO;
        attr->show = clockgate_delay_show;
        attr->store = clockgate_delay_store;
+       sysfs_attr_init(&attr->attr);
        if (sysfs_create_file(pdata->power_kobj, &attr->attr)) {
                dev_err(&dev->dev, "Could not create sysfs attribute clockgate_delay\n");
                err = -EIO;
@@ -499,6 +500,7 @@ int nvhost_module_init(struct platform_device *dev)
        attr->attr.mode = S_IWUSR | S_IRUGO;
        attr->show = powergate_delay_show;
        attr->store = powergate_delay_store;
+       sysfs_attr_init(&attr->attr);
        if (sysfs_create_file(pdata->power_kobj, &attr->attr)) {
                dev_err(&dev->dev, "Could not create sysfs attribute powergate_delay\n");
                err = -EIO;

diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c
index 4ea8286ec14ebad34a2dfe238d3121e3a6b11ab3..7b2906b5e1d3618a7e9d8807a77628c5086cd47c 100644 (file)
--- a/drivers/video/tegra/host/nvhost_syncpt.c
+++ b/drivers/video/tegra/host/nvhost_syncpt.c
@@ -652,6 +652,8 @@ int nvhost_syncpt_init(struct platform_device *dev,
                min->attr.attr.name = min_name;
                min->attr.attr.mode = S_IRUGO;
                min->attr.show = syncpt_min_show;
+               sysfs_attr_init(&min->attr.attr);
+               sysfs_attr_init(&max->attr.attr);
                if (sysfs_create_file(kobj, &min->attr.attr)) {
                        err = -EIO;
                        goto fail;