diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2017-06-28 17:23:28 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-07-04 17:11:02 +0300 |
| commit | 21bf440ce18e49b24601c3d1d25f691ef0334c4b (patch) | |
| tree | fd6cda20a1c0ffac14d82672cf1bace3d4dea1f8 | |
| parent | 9809cb831c9645d61ee9501c308045bb3d8afd31 (diff) | |
| download | linux-21bf440ce18e49b24601c3d1d25f691ef0334c4b.tar.xz | |
i2c: designware: Make HW init functions static
Recent i2c-designware slave support patches use master or slave HW init
functions through the function pointer so we can declare them static.
While at it, rename i2c_dw_init() as i2c_dw_init_master().
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Luis Oliveira <lolivei@synopsys.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.h | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-master.c | 7 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-slave.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 7bfbcc62f6c5..a403dcdfca4b 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -306,8 +306,6 @@ int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev); u32 i2c_dw_func(struct i2c_adapter *adap); void i2c_dw_disable(struct dw_i2c_dev *dev); void i2c_dw_disable_int(struct dw_i2c_dev *dev); -int i2c_dw_init(struct dw_i2c_dev *dev); -int i2c_dw_init_slave(struct dw_i2c_dev *dev); extern u32 i2c_dw_read_comp_param(struct dw_i2c_dev *dev); extern int i2c_dw_probe(struct dw_i2c_dev *dev); diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index eefc4db1ee3e..418c233075d3 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -51,7 +51,7 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev) * This function is called during I2C init function, and in case of timeout at * run time. */ -int i2c_dw_init(struct dw_i2c_dev *dev) +static int i2c_dw_init_master(struct dw_i2c_dev *dev) { u32 hcnt, lcnt; u32 reg, comp_param1; @@ -171,7 +171,6 @@ int i2c_dw_init(struct dw_i2c_dev *dev) return 0; } -EXPORT_SYMBOL_GPL(i2c_dw_init); static void i2c_dw_xfer_init(struct dw_i2c_dev *dev) { @@ -444,7 +443,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) if (!wait_for_completion_timeout(&dev->cmd_complete, adap->timeout)) { dev_err(dev->dev, "controller timed out\n"); /* i2c_dw_init implicitly disables the adapter */ - i2c_dw_init(dev); + i2c_dw_init_master(dev); ret = -ETIMEDOUT; goto done; } @@ -622,7 +621,7 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) init_completion(&dev->cmd_complete); - dev->init = i2c_dw_init; + dev->init = i2c_dw_init_master; dev->disable = i2c_dw_disable; dev->disable_int = i2c_dw_disable_int; diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c index 100643f47244..0548c7ea578c 100644 --- a/drivers/i2c/busses/i2c-designware-slave.c +++ b/drivers/i2c/busses/i2c-designware-slave.c @@ -49,7 +49,7 @@ static void i2c_dw_configure_fifo_slave(struct dw_i2c_dev *dev) * This function is called during I2C init function, and in case of timeout at * run time. */ -int i2c_dw_init_slave(struct dw_i2c_dev *dev) +static int i2c_dw_init_slave(struct dw_i2c_dev *dev) { u32 sda_falling_time, scl_falling_time; u32 reg, comp_param1; @@ -168,7 +168,6 @@ int i2c_dw_init_slave(struct dw_i2c_dev *dev) return 0; } -EXPORT_SYMBOL_GPL(i2c_dw_init_slave); static int i2c_dw_reg_slave(struct i2c_client *slave) { |