]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
iommu/tegra: smmu: of: remove dead code
authorSri Krishna chowdary <schowdary@nvidia.com>
Mon, 27 Oct 2014 12:32:25 +0000 (18:02 +0530)
committerSri Krishna Chowdary <schowdary@nvidia.com>
Tue, 28 Oct 2014 15:46:19 +0000 (08:46 -0700)
All Dt files follow the upstream bindings now. No need to
support fallback path anymore.

Bug 1275792

Change-Id: I3bbb073ebc2ba46038862e89867685feebfad518
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/590403
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
drivers/iommu/of_tegra-smmu.c

index 4cc12a49cbdf87ce286fd252c2cca6eac2b8c956..7ca70c74be7e5204a06fc7bbd164f04570fefb32 100644 (file)
@@ -176,13 +176,13 @@ u64 tegra_smmu_of_get_swgids(struct device *dev,
                if (!of_match_node(matches, ret->np))
                        continue;
 
-               if (ret->args_count == 1)  {
-                       swgids |= BIT(ret->args[0]);
-               } else {
-                       /* XXX: Remove once DT has upstream iommus= */
-                       memcpy(&swgids, ret->args, sizeof(u64));
+               if (ret->args_count != 1) {
+                       dev_err(dev, "iommus contains %d cells, expected 1\n",
+                               ret->args_count);
                        break;
                }
+
+               swgids |= BIT(ret->args[0]);
        }
 
        swgids = swgids ? swgids : SWGIDS_ERROR_CODE;