scsi: ufs: ufs-exynos: Simplify drv_data retrieval

The compatible field of exynos_ufs_drv_data is not necessary because
of_device_id already has it. Thus, we don't need it anymore and we can get
drv_data by device_get_match_data.

Link: https://lore.kernel.org/r/20211018124216.153072-5-chanho61.park@samsung.com
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-exynos.c b/drivers/scsi/ufs/ufs-exynos.c
index b2ec9e20b14d2c7085a766de4ca12b75ba014886..853c83fd824210b821ed114cfebac36cf4630feb 100644 (file)
--- a/drivers/scsi/ufs/ufs-exynos.c
+++ b/drivers/scsi/ufs/ufs-exynos.c
@@ -893,17 +893,10 @@ static int exynos_ufs_post_link(struct ufs_hba *hba)
 static int exynos_ufs_parse_dt(struct device *dev, struct exynos_ufs *ufs)
 {
        struct device_node *np = dev->of_node;
-       struct exynos_ufs_drv_data *drv_data = &exynos_ufs_drvs;
        struct exynos_ufs_uic_attr *attr;
        int ret = 0;
 
-       while (drv_data->compatible) {
-               if (of_device_is_compatible(np, drv_data->compatible)) {
-                       ufs->drv_data = drv_data;
-                       break;
-               }
-               drv_data++;
-       }
+       ufs->drv_data = device_get_match_data(dev);
 
        if (ufs->drv_data && ufs->drv_data->uic_attr) {
                attr = ufs->drv_data->uic_attr;
@@ -1262,7 +1255,6 @@ static struct exynos_ufs_uic_attr exynos7_uic_attr = {
 };
 
 static struct exynos_ufs_drv_data exynos_ufs_drvs = {
-       .compatible             = "samsung,exynos7-ufs",
        .uic_attr               = &exynos7_uic_attr,
        .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
                                  UFSHCI_QUIRK_BROKEN_REQ_LIST_CLR |

diff --git a/drivers/scsi/ufs/ufs-exynos.h b/drivers/scsi/ufs/ufs-exynos.h
index 0a31f77a5f48da08e774accd083ba7fcf9b10dc6..2e72aabaa6732a975455aa1f9203fdf114008054 100644 (file)
--- a/drivers/scsi/ufs/ufs-exynos.h
+++ b/drivers/scsi/ufs/ufs-exynos.h
@@ -142,7 +142,6 @@ struct exynos_ufs_uic_attr {
 };
 
 struct exynos_ufs_drv_data {
-       char *compatible;
        struct exynos_ufs_uic_attr *uic_attr;
        unsigned int quirks;
        unsigned int opts;
@@ -191,7 +190,7 @@ struct exynos_ufs {
        struct ufs_pa_layer_attr dev_req_params;
        struct ufs_phy_time_cfg t_cfg;
        ktime_t entry_hibern8_t;
-       struct exynos_ufs_drv_data *drv_data;
+       const struct exynos_ufs_drv_data *drv_data;
 
        u32 opts;
 #define EXYNOS_UFS_OPT_HAS_APB_CLK_CTRL                BIT(0)