mmc: use octal file permissions instead of symbolic

As stated in Documentation/dev-tools/checkpatch.rst, octal file
permissions are preferred over symbolic constants because they are
easier to read and understand. Replace symbolic permissions with
their octal equivalents.

Signed-off-by: Pedro Demarchi Gomes <pedrodemargomes@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 73e171305d381563af5be61f34559880b1a2b9d0..92e2879cf1c0ce1f5b02497b1e44ddde3e94699f 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -349,10 +349,10 @@ static umode_t mmc_disk_attrs_is_visible(struct kobject *kobj,
        if (a == &dev_attr_ro_lock_until_next_power_on.attr &&
            (md->area_type & MMC_BLK_DATA_AREA_BOOT) &&
            md->queue.card->ext_csd.boot_ro_lockable) {
-               mode = S_IRUGO;
+               mode = 0444;
                if (!(md->queue.card->ext_csd.boot_ro_lock &
                                EXT_CSD_BOOT_WP_B_PWR_WP_DIS))
-                       mode |= S_IWUSR;
+                       mode |= 0200;
        }
 
        mmc_blk_put(md);
@@ -3191,7 +3191,7 @@ static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md)
 
        if (mmc_card_mmc(card)) {
                md->ext_csd_dentry =
-                       debugfs_create_file("ext_csd", S_IRUSR, root, card,
+                       debugfs_create_file("ext_csd", 0400, root, card,
                                            &mmc_dbg_ext_csd_fops);
        }
 }

diff --git a/drivers/mmc/core/bus.h b/drivers/mmc/core/bus.h
index cfd0d02d34205f070a36c4695cb7e12f0127b833..8b69624fa46ebb7415c092bf1bb498a444434e0e 100644 (file)
--- a/drivers/mmc/core/bus.h
+++ b/drivers/mmc/core/bus.h
@@ -20,7 +20,7 @@ static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *a
        struct mmc_card *card = mmc_dev_to_card(dev);                           \
        return sysfs_emit(buf, fmt, args);                                      \
 }                                                                              \
-static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
+static DEVICE_ATTR(name, 0444, mmc_##name##_show, NULL)
 
 struct mmc_card *mmc_alloc_card(struct mmc_host *host,
                                const struct device_type *type);

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 3e7d9437477c76ec8e423a11c13427917e154b96..7c86efb1044a3752787312fd20d1da483a90bced 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -831,7 +831,7 @@ static ssize_t mmc_fwrev_show(struct device *dev,
                                  card->ext_csd.fwrev);
 }
 
-static DEVICE_ATTR(fwrev, S_IRUGO, mmc_fwrev_show, NULL);
+static DEVICE_ATTR(fwrev, 0444, mmc_fwrev_show, NULL);
 
 static ssize_t mmc_dsr_show(struct device *dev,
                            struct device_attribute *attr,
@@ -847,7 +847,7 @@ static ssize_t mmc_dsr_show(struct device *dev,
                return sysfs_emit(buf, "0x%x\n", 0x404);
 }
 
-static DEVICE_ATTR(dsr, S_IRUGO, mmc_dsr_show, NULL);
+static DEVICE_ATTR(dsr, 0444, mmc_dsr_show, NULL);
 
 static struct attribute *mmc_std_attrs[] = {
        &dev_attr_cid.attr,

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index 67d4a301895c905bf52776f970bfc7a8f86a65aa..a74089df45474bb72f4ed372efd6a154a4799bd8 100644 (file)
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -3212,12 +3212,12 @@ static int mmc_test_register_dbgfs_file(struct mmc_card *card)
 
        mutex_lock(&mmc_test_lock);
 
-       ret = __mmc_test_register_dbgfs_file(card, "test", S_IWUSR | S_IRUGO,
+       ret = __mmc_test_register_dbgfs_file(card, "test", 0644,
                &mmc_test_fops_test);
        if (ret)
                goto err;
 
-       ret = __mmc_test_register_dbgfs_file(card, "testlist", S_IRUGO,
+       ret = __mmc_test_register_dbgfs_file(card, "testlist", 0444,
                &mtf_testlist_fops);
        if (ret)
                goto err;

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 67cd630048297623119f01e40b79f38df831737d..b6758911e22cda08d22800b6772b4d4c8438561d 100644 (file)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -744,7 +744,7 @@ static ssize_t mmc_dsr_show(struct device *dev, struct device_attribute *attr,
        return sysfs_emit(buf, "0x%x\n", 0x404);
 }
 
-static DEVICE_ATTR(dsr, S_IRUGO, mmc_dsr_show, NULL);
+static DEVICE_ATTR(dsr, 0444, mmc_dsr_show, NULL);
 
 MMC_DEV_ATTR(vendor, "0x%04x\n", card->cis.vendor);
 MMC_DEV_ATTR(device, "0x%04x\n", card->cis.device);

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index d1fbc6811563a3fa2166c58b4aedbc20c25a74c4..fdf6926ea468277e936e89f62e5b13d2631f4a2e 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -609,12 +609,12 @@ static void atmci_init_debugfs(struct atmel_mci_slot *slot)
        if (!root)
                return;
 
-       debugfs_create_file("regs", S_IRUSR, root, host, &atmci_regs_fops);
-       debugfs_create_file("req", S_IRUSR, root, slot, &atmci_req_fops);
-       debugfs_create_u32("state", S_IRUSR, root, &host->state);
-       debugfs_create_xul("pending_events", S_IRUSR, root,
+       debugfs_create_file("regs", 0400, root, host, &atmci_regs_fops);
+       debugfs_create_file("req", 0400, root, slot, &atmci_req_fops);
+       debugfs_create_u32("state", 0400, root, &host->state);
+       debugfs_create_xul("pending_events", 0400, root,
                           &host->pending_events);
-       debugfs_create_xul("completed_events", S_IRUSR, root,
+       debugfs_create_xul("completed_events", 0400, root,
                           &host->completed_events);
 }
 

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 2b7d6d9bcde514c868060df3ebf5e11ca0f04aab..42b0118a45a8ec8ec9bfad1ff20556b5e24252ad 100644 (file)
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -145,17 +145,17 @@
 #define MAX_NR_SG      16
 
 static unsigned rw_threshold = 32;
-module_param(rw_threshold, uint, S_IRUGO);
+module_param(rw_threshold, uint, 0444);
 MODULE_PARM_DESC(rw_threshold,
                "Read/Write threshold. Default = 32");
 
 static unsigned poll_threshold = 128;
-module_param(poll_threshold, uint, S_IRUGO);
+module_param(poll_threshold, uint, 0444);
 MODULE_PARM_DESC(poll_threshold,
                 "Polling transaction size threshold. Default = 128");
 
 static unsigned poll_loopcount = 32;
-module_param(poll_loopcount, uint, S_IRUGO);
+module_param(poll_loopcount, uint, 0444);
 MODULE_PARM_DESC(poll_loopcount,
                 "Maximum polling loop count. Default = 32");
 

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index c5db92bbb0946f5538f0e38df13556ea38aa02b2..2380ab82812a55a1f1377057046d88c2293226a2 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -175,12 +175,12 @@ static void dw_mci_init_debugfs(struct dw_mci_slot *slot)
        if (!root)
                return;
 
-       debugfs_create_file("regs", S_IRUSR, root, host, &dw_mci_regs_fops);
-       debugfs_create_file("req", S_IRUSR, root, slot, &dw_mci_req_fops);
-       debugfs_create_u32("state", S_IRUSR, root, &host->state);
-       debugfs_create_xul("pending_events", S_IRUSR, root,
+       debugfs_create_file("regs", 0400, root, host, &dw_mci_regs_fops);
+       debugfs_create_file("req", 0400, root, slot, &dw_mci_req_fops);
+       debugfs_create_u32("state", 0400, root, &host->state);
+       debugfs_create_xul("pending_events", 0400, root,
                           &host->pending_events);
-       debugfs_create_xul("completed_events", S_IRUSR, root,
+       debugfs_create_xul("completed_events", 0400, root,
                           &host->completed_events);
 #ifdef CONFIG_FAULT_INJECTION
        fault_create_debugfs_attr("fail_data_crc", root, &host->fail_data_crc);

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 52ac3f128a1ca0d875e4726583e25f02256d64e9..5fc7d6d722b771f302911fc67e796178cd05dbe4 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -326,7 +326,7 @@ mmc_omap_show_cover_switch(struct device *dev, struct device_attribute *attr,
                       "closed");
 }
 
-static DEVICE_ATTR(cover_switch, S_IRUGO, mmc_omap_show_cover_switch, NULL);
+static DEVICE_ATTR(cover_switch, 0444, mmc_omap_show_cover_switch, NULL);
 
 static ssize_t
 mmc_omap_show_slot_name(struct device *dev, struct device_attribute *attr,
@@ -338,7 +338,7 @@ mmc_omap_show_slot_name(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "%s\n", slot->pdata->name);
 }
 
-static DEVICE_ATTR(slot_name, S_IRUGO, mmc_omap_show_slot_name, NULL);
+static DEVICE_ATTR(slot_name, 0444, mmc_omap_show_slot_name, NULL);
 
 static void
 mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 09e4354d1f1db85bc2aeb2f7c690471e5c131a14..58c881f2725b1346fb44498ef74fa6812abdcf2a 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -746,7 +746,7 @@ omap_hsmmc_show_slot_name(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "%s\n", mmc_pdata(host)->name);
 }
 
-static DEVICE_ATTR(slot_name, S_IRUGO, omap_hsmmc_show_slot_name, NULL);
+static DEVICE_ATTR(slot_name, 0444, omap_hsmmc_show_slot_name, NULL);
 
 /*
  * Configure the response type and send the cmd.
@@ -1672,7 +1672,7 @@ DEFINE_SHOW_ATTRIBUTE(mmc_regs);
 static void omap_hsmmc_debugfs(struct mmc_host *mmc)
 {
        if (mmc->debugfs_root)
-               debugfs_create_file("regs", S_IRUSR, mmc->debugfs_root,
+               debugfs_create_file("regs", 0400, mmc->debugfs_root,
                        mmc, &mmc_regs_fops);
 }