Patchwork i2c: mv64xxx: Fix some build warnings

login
register
mail settings
Submitter Thierry Reding
Date Sept. 18, 2013, 12:50 p.m.
Message ID <1379508652-30348-1-git-send-email-treding@nvidia.com>
Download mbox | patch
Permalink /patch/275705/
State Accepted
Headers show

Comments

Thierry Reding - Sept. 18, 2013, 12:50 p.m.
Some functions and variables are only used if the configuration selects
HAVE_CLK. Protect them with a corresponding #ifdef CONFIG_HAVE_CLK block
to avoid compiler warnings.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/i2c/busses/i2c-mv64xxx.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
Wolfram Sang - Sept. 23, 2013, 6:59 a.m.
On Wed, Sep 18, 2013 at 02:50:52PM +0200, Thierry Reding wrote:
> Some functions and variables are only used if the configuration selects
> HAVE_CLK. Protect them with a corresponding #ifdef CONFIG_HAVE_CLK block
> to avoid compiler warnings.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Added marker to #endif and applied to for-current, thanks!

Patch

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 5aead74..bfd870c 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -697,6 +697,7 @@  static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
 MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
 
 #ifdef CONFIG_OF
+#ifdef CONFIG_HAVE_CLK
 static int
 mv64xxx_calc_freq(const int tclk, const int n, const int m)
 {
@@ -726,16 +727,12 @@  mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
 		return false;
 	return true;
 }
+#endif
 
 static int
 mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
 		  struct device *dev)
 {
-	const struct of_device_id *device;
-	struct device_node *np = dev->of_node;
-	u32 bus_freq, tclk;
-	int rc = 0;
-
 	/* CLK is mandatory when using DT to describe the i2c bus. We
 	 * need to know tclk in order to calculate bus clock
 	 * factors.
@@ -744,6 +741,11 @@  mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
 	/* Have OF but no CLK */
 	return -ENODEV;
 #else
+	const struct of_device_id *device;
+	struct device_node *np = dev->of_node;
+	u32 bus_freq, tclk;
+	int rc = 0;
+
 	if (IS_ERR(drv_data->clk)) {
 		rc = -ENODEV;
 		goto out;