Commit 588e5a06 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andi Shyti
Browse files

i2c: designware: Uninline i2c_dw_probe() 



Since i2c_dw_probe() is going to be extended, uninline it to reduce
the noise in the common header.

Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 18024d60

drivers/i2c/busses/i2c-designware-common.c

+14 −0
Original line number Diff line number Diff line
@@ -737,6 +737,20 @@ void i2c_dw_disable(struct dw_i2c_dev *dev) 
}

EXPORT_SYMBOL_GPL(i2c_dw_disable);



int i2c_dw_probe(struct dw_i2c_dev *dev)

{

	switch (dev->mode) {

	case DW_IC_SLAVE:

		return i2c_dw_probe_slave(dev);

	case DW_IC_MASTER:

		return i2c_dw_probe_master(dev);

	default:

		dev_err(dev->dev, "Wrong operation mode: %d\n", dev->mode);

		return -EINVAL;

	}

}

EXPORT_SYMBOL_GPL(i2c_dw_probe);



static int i2c_dw_prepare(struct device *device)

{

	/*

drivers/i2c/busses/i2c-designware-core.h

+2 −15
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 
 */



#include <linux/bits.h>

#include <linux/compiler_types.h>

#include <linux/completion.h>

#include <linux/dev_printk.h>

#include <linux/errno.h>

#include <linux/i2c.h>

#include <linux/pm.h>
@@ -388,19 +386,6 @@ static inline void i2c_dw_configure_slave(struct dw_i2c_dev *dev) { } 
static inline int i2c_dw_probe_slave(struct dw_i2c_dev *dev) { return -EINVAL; }

#endif



static inline int i2c_dw_probe(struct dw_i2c_dev *dev)

{

	switch (dev->mode) {

	case DW_IC_SLAVE:

		return i2c_dw_probe_slave(dev);

	case DW_IC_MASTER:

		return i2c_dw_probe_master(dev);

	default:

		dev_err(dev->dev, "Wrong operation mode: %d\n", dev->mode);

		return -EINVAL;

	}

}



static inline void i2c_dw_configure(struct dw_i2c_dev *dev)

{

	if (i2c_detect_slave_mode(dev->dev))
@@ -409,6 +394,8 @@ static inline void i2c_dw_configure(struct dw_i2c_dev *dev) 
		i2c_dw_configure_master(dev);

}



int i2c_dw_probe(struct dw_i2c_dev *dev);



#if IS_ENABLED(CONFIG_I2C_DESIGNWARE_BAYTRAIL)

int i2c_dw_baytrail_probe_lock_support(struct dw_i2c_dev *dev);

#endif