Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1a99467 authored by Thierry Reding's avatar Thierry Reding Committed by Wolfram Sang
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
[wsa: added marker to #endif]
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 15336913

drivers/i2c/busses/i2c-mv64xxx.c

+7 −5
Original line number Diff line number Diff line
@@ -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 /* CONFIG_HAVE_CLK */



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;