Skip to content

Commit

Permalink
scsi: ufs: ufs-exynos: Simplify drv_data retrieval
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chanho Park authored and Martin K. Petersen committed Oct 28, 2021
1 parent e387d44 commit 51cc3bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
10 changes: 1 addition & 9 deletions drivers/scsi/ufs/ufs-exynos.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 |
Expand Down
3 changes: 1 addition & 2 deletions drivers/scsi/ufs/ufs-exynos.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 51cc3bb

Please sign in to comment.