From: Rene Kolarik <rene.kolarik@gmail.com>
To: gregkh@linuxfoundation.org, shawn.guo@freescale.com,
kernel@pengutronix.de
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org
Subject: [PATCH]imx-drm coding style fixes
Date: Fri, 19 Sep 2014 00:57:36 +0200 [thread overview]
Message-ID: <20140918225736.GA15881@rendy-i5> (raw)
[-- Attachment #1: Type: text/plain, Size: 130 bytes --]
Hello,
I've fixed coding style issues in drivers/staging/imx-drm directory. This is a part of Eudyptula Challenge.
Rene Kolarik
[-- Attachment #2: imx-coding-style.patch --]
[-- Type: text/x-diff, Size: 3347 bytes --]
Signed-off-by: Rene Kolarik <rene.kolarik@gmail.com>
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index e935d7d..4004bb8 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -71,6 +71,10 @@ i.MX53 generic board
Required root node properties:
- compatible = "fsl,imx53";
+i.MX53 Television Encoder
+Required root node properties:
+ - compatible = "fsl,imx53-tve";
+
i.MX6q generic board
Required root node properties:
- compatible = "fsl,imx6q";
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index e9fba97..a04b3ef 100644
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -630,7 +630,8 @@ static int imx_drm_platform_probe(struct platform_device *pdev)
continue;
}
- component_match_add(&pdev->dev, &match, compare_of, remote);
+ component_match_add(&pdev->dev, &match, compare_of,
+ remote);
of_node_put(remote);
}
of_node_put(port);
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 18c9ccd..aaec6b2 100644
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -323,8 +323,7 @@ static unsigned int hdmi_compute_cts(unsigned int freq, unsigned long pixel_clk,
}
if (ratio == 100)
return cts;
- else
- return (cts * ratio) / 100;
+ return (cts * ratio) / 100;
}
static void hdmi_set_clk_regenerator(struct imx_hdmi *hdmi,
diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 31fe7cf..a12202a 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -430,10 +430,9 @@ static long clk_tve_di_round_rate(struct clk_hw *hw, unsigned long rate,
div = *prate / rate;
if (div >= 4)
return *prate / 4;
- else if (div >= 2)
+ if (div >= 2)
return *prate / 2;
- else
- return *prate;
+ return *prate;
}
static int clk_tve_di_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -538,7 +537,7 @@ static struct regmap_config tve_regmap_config = {
.max_register = 0xdc,
};
-static const char *imx_tve_modes[] = {
+static const char * const imx_tve_modes[] = {
[TVE_MODE_TVOUT] = "tvout",
[TVE_MODE_VGA] = "vga",
};
@@ -666,7 +665,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
ret = regmap_read(tve->regmap, TVE_COM_CONF_REG, &val);
if (ret < 0) {
- dev_err(dev, "failed to read configuration register: %d\n", ret);
+ dev_err(dev, "failed to read configuration register: %d\n",
+ ret);
return ret;
}
if (val != 0x00100000) {
diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index 1998846..601439b 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -228,7 +228,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
else if (!strcmp(fmt, "bgr666"))
imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666;
else if (!strcmp(fmt, "lvds666"))
- imxpd->interface_pix_fmt = v4l2_fourcc('L', 'V', 'D', '6');
+ imxpd->interface_pix_fmt = v4l2_fourcc(
+ 'L', 'V', 'D', '6');
}
panel_node = of_parse_phandle(np, "fsl,panel", 0);
next reply other threads:[~2014-09-18 22:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-18 22:57 Rene Kolarik [this message]
2014-09-19 4:22 ` Giedrius Statkevičius
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140918225736.GA15881@rendy-i5 \
--to=rene.kolarik@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=shawn.guo@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome