staging: imx-drm: imx-hdmi: clean up hdmi_phy_wait_i2c_done

Simplify hdmi_phy_wait_i2c_done so the call to hdmi_readb is
only done in one place. Also check for timout before waiting
as suggested by Troy Kisky.
This also fixes a checkpatch warning.

Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index d47dedd2cdb416fceb7b0bf90f3fda129e8036ab..13071330acadf8df1c281901aa75f8408138d415 100644 (file)
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -659,13 +659,10 @@ static inline void hdmi_phy_test_dout(struct imx_hdmi *hdmi,
 
 static bool hdmi_phy_wait_i2c_done(struct imx_hdmi *hdmi, int msec)
 {
-       unsigned char val = 0;
-       val = hdmi_readb(hdmi, HDMI_IH_I2CMPHY_STAT0) & 0x3;
-       while (!val) {
-               udelay(1000);
+       while ((hdmi_readb(hdmi, HDMI_IH_I2CMPHY_STAT0) & 0x3) == 0) {
                if (msec-- == 0)
                        return false;
-               val = hdmi_readb(hdmi, HDMI_IH_I2CMPHY_STAT0) & 0x3;
+               udelay(1000);
        }
        return true;
 }