Merge tag 'block-5.14-2021-07-16' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / memory / tegra / tegra124-emc.c

diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index 5699d90..908f8d5 100644 (file)
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -272,8 +272,8 @@
 #define EMC_PUTERM_ADJ                         0x574
 
 #define DRAM_DEV_SEL_ALL                       0
-#define DRAM_DEV_SEL_0                         (2 << 30)
-#define DRAM_DEV_SEL_1                         (1 << 30)
+#define DRAM_DEV_SEL_0                         BIT(31)
+#define DRAM_DEV_SEL_1                         BIT(30)
 
 #define EMC_CFG_POWER_FEATURES_MASK            \
        (EMC_CFG_DYN_SREF | EMC_CFG_DRAM_ACPD | EMC_CFG_DRAM_CLKSTOP_SR | \
@@ -1269,10 +1269,6 @@ static void emc_debugfs_init(struct device *dev, struct tegra_emc *emc)
        }
 
        emc->debugfs.root = debugfs_create_dir("emc", NULL);
-       if (!emc->debugfs.root) {
-               dev_err(dev, "failed to create debugfs directory\n");
-               return;
-       }
 
        debugfs_create_file("available_rates", 0444, emc->debugfs.root, emc,
                            &tegra_emc_debug_available_rates_fops);