diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2013-09-18 08:50:52 -0400 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-09-27 12:12:30 -0400 |
| commit | c1a99467804767400752a4087d3e96af2759a046 (patch) | |
| tree | da7234c5f319259a9b01c34be9e53c76ed4483cd /drivers/i2c | |
| parent | 153369139a06462c310b607e612093074c73b382 (diff) | |
i2c: mv64xxx: Fix some build warnings
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>
[wsa: added marker to #endif]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 7f3a47443494..52c694363b27 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[] = { | |||
| 697 | MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table); | 697 | MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table); |
| 698 | 698 | ||
| 699 | #ifdef CONFIG_OF | 699 | #ifdef CONFIG_OF |
| 700 | #ifdef CONFIG_HAVE_CLK | ||
| 700 | static int | 701 | static int |
| 701 | mv64xxx_calc_freq(const int tclk, const int n, const int m) | 702 | mv64xxx_calc_freq(const int tclk, const int n, const int m) |
| 702 | { | 703 | { |
| @@ -726,16 +727,12 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n, | |||
| 726 | return false; | 727 | return false; |
| 727 | return true; | 728 | return true; |
| 728 | } | 729 | } |
| 730 | #endif /* CONFIG_HAVE_CLK */ | ||
| 729 | 731 | ||
| 730 | static int | 732 | static int |
| 731 | mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, | 733 | mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, |
| 732 | struct device *dev) | 734 | struct device *dev) |
| 733 | { | 735 | { |
| 734 | const struct of_device_id *device; | ||
| 735 | struct device_node *np = dev->of_node; | ||
| 736 | u32 bus_freq, tclk; | ||
| 737 | int rc = 0; | ||
| 738 | |||
| 739 | /* CLK is mandatory when using DT to describe the i2c bus. We | 736 | /* CLK is mandatory when using DT to describe the i2c bus. We |
| 740 | * need to know tclk in order to calculate bus clock | 737 | * need to know tclk in order to calculate bus clock |
| 741 | * factors. | 738 | * factors. |
| @@ -744,6 +741,11 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, | |||
| 744 | /* Have OF but no CLK */ | 741 | /* Have OF but no CLK */ |
| 745 | return -ENODEV; | 742 | return -ENODEV; |
| 746 | #else | 743 | #else |
| 744 | const struct of_device_id *device; | ||
| 745 | struct device_node *np = dev->of_node; | ||
| 746 | u32 bus_freq, tclk; | ||
| 747 | int rc = 0; | ||
| 748 | |||
| 747 | if (IS_ERR(drv_data->clk)) { | 749 | if (IS_ERR(drv_data->clk)) { |
| 748 | rc = -ENODEV; | 750 | rc = -ENODEV; |
| 749 | goto out; | 751 | goto out; |
