Skip to content

Commit

Permalink
phy: exynos-mipi-video: Use spin_lock to protct state->regmap rmw ope…
Browse files Browse the repository at this point in the history
…rations

The state->regmap is initialized by devm_regmap_init_mmio().
So it's fine to use spin_lock rather than mutex to protct state->regmap rmw
operations.

Signed-off-by: Axel Lin <[email protected]>
Acked-by: Sylwester Nawrocki <[email protected]>
Tested-by: Sylwester Nawrocki <[email protected]>
[[email protected]: Found an issue with the original patch w.r.t unbalanced
 spin_lock call]
Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
  • Loading branch information
AxelLin authored and kishon committed Mar 11, 2015
1 parent cfd565d commit af69dec
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/phy/phy-exynos-mipi-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ struct exynos_mipi_video_phy {
} phys[EXYNOS_MIPI_PHYS_NUM];
spinlock_t slock;
void __iomem *regs;
struct mutex mutex;
struct regmap *regmap;
};

Expand All @@ -59,8 +58,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
else
reset = EXYNOS4_MIPI_PHY_SRESETN;

spin_lock(&state->slock);

if (!IS_ERR(state->regmap)) {
mutex_lock(&state->mutex);
regmap_read(state->regmap, offset, &val);
if (on)
val |= reset;
Expand All @@ -72,11 +72,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
else if (!(val & EXYNOS4_MIPI_PHY_RESET_MASK))
val &= ~EXYNOS4_MIPI_PHY_ENABLE;
regmap_write(state->regmap, offset, val);
mutex_unlock(&state->mutex);
} else {
addr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2);

spin_lock(&state->slock);
val = readl(addr);
if (on)
val |= reset;
Expand All @@ -90,9 +88,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
val &= ~EXYNOS4_MIPI_PHY_ENABLE;

writel(val, addr);
spin_unlock(&state->slock);
}

spin_unlock(&state->slock);
return 0;
}

Expand Down Expand Up @@ -158,7 +156,6 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev)

dev_set_drvdata(dev, state);
spin_lock_init(&state->slock);
mutex_init(&state->mutex);

for (i = 0; i < EXYNOS_MIPI_PHYS_NUM; i++) {
struct phy *phy = devm_phy_create(dev, NULL,
Expand Down

0 comments on commit af69dec

Please sign in to comment.