aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/imx-drm
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-04-28 08:01:07 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-23 20:44:43 +0900
commitb44ab1b0df0a3d35ca31dca077c22ec545906626 (patch)
tree31994a4da7137bd207447ef57b37970b9f2b4b7a /drivers/staging/imx-drm
parentstaging: et131x: Remove empty file Module.symvers (diff)
downloadlinux-dev-b44ab1b0df0a3d35ca31dca077c22ec545906626.tar.xz
linux-dev-b44ab1b0df0a3d35ca31dca077c22ec545906626.zip
imx-hdmi: Make checkpatch happy
WARNING: Missing a blank line after declarations #160: FILE: drivers/staging/imx-drm/imx-hdmi.c:160: + u8 val = hdmi_readb(hdmi, reg) & ~mask; + val |= data & mask; WARNING: Missing a blank line after declarations #1609: FILE: drivers/staging/imx-drm/imx-hdmi.c:1609: + const struct platform_device_id *device_id = of_id->data; + hdmi->dev_type = device_id->driver_data; total: 0 errors, 2 warnings, 1767 lines checked drivers/staging/imx-drm/imx-hdmi.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
-rw-r--r--drivers/staging/imx-drm/imx-hdmi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 886a0d49031b..1b440483f28f 100644
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -157,6 +157,7 @@ static inline u8 hdmi_readb(struct imx_hdmi *hdmi, int offset)
static void hdmi_modb(struct imx_hdmi *hdmi, u8 data, u8 mask, unsigned reg)
{
u8 val = hdmi_readb(hdmi, reg) & ~mask;
+
val |= data & mask;
hdmi_writeb(hdmi, val, reg);
}
@@ -1606,6 +1607,7 @@ static int imx_hdmi_bind(struct device *dev, struct device *master, void *data)
if (of_id) {
const struct platform_device_id *device_id = of_id->data;
+
hdmi->dev_type = device_id->driver_data;
}