[PATCH] input/mfd/ucb1400: move static function from header to its user

[PATCH] input/mfd/ucb1400: move static function from header to its user

[Sebastian Andrzej Siewior]

it's a little too large for static line and just static is somehow ....

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
The only user I've seen is ts driver.

 drivers/input/touchscreen/ucb1400_ts.c |   19 +++++++++++++++++++
 include/linux/ucb1400.h                |   19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 1647bc4..f2377a2 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -44,6 +44,25 @@ static inline void ucb1400_ts_mode_int(struct snd_ac97 *ac97)
 			UCB_TS_CR_MODE_INT);
 }
 
+static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
+		int adcsync)
+{
+	unsigned int val;
+
+	if (adcsync)
+		adc_channel |= UCB_ADC_SYNC_ENA;
+
+	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
+	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
+			UCB_ADC_START);
+
+	while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
+				& UCB_ADC_DAT_VALID))
+		schedule_timeout_uninterruptible(1);
+
+	return val & UCB_ADC_DAT_MASK;
+}
+
 /*
  * Switch to pressure mode, and read pressure.  We don't need to wait
  * here, since both plates are being driven.
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index 970473b..bf4f547 100644
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -134,25 +134,6 @@ static inline void ucb1400_adc_enable(struct snd_ac97 *ac97)
 	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA);
 }
 
-static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
-					int adcsync)
-{
-	unsigned int val;
-
-	if (adcsync)
-		adc_channel |= UCB_ADC_SYNC_ENA;
-
-	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
-	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
-				UCB_ADC_START);
-
-	while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
-			& UCB_ADC_DAT_VALID))
-		schedule_timeout_uninterruptible(1);
-
-	return val & UCB_ADC_DAT_MASK;
-}
-
 static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
 {
 	ucb1400_reg_write(ac97, UCB_ADC_CR, 0);
-- 
1.5.6.5

Re: [PATCH] input/mfd/ucb1400: move static function from header to its user

[Marek Vasut]

On Thursday 08 of January 2009 12:07:57 Sebastian Andrzej Siewior wrote:
> it's a little too large for static line and just static is somehow ....
>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> The only user I've seen is ts driver.

NAK, this is used by the battery as well (which is not merged yet, see ARM 
linux mailing list for it)

>
>  drivers/input/touchscreen/ucb1400_ts.c |   19 +++++++++++++++++++
>  include/linux/ucb1400.h                |   19 -------------------
>  2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/input/touchscreen/ucb1400_ts.c
> b/drivers/input/touchscreen/ucb1400_ts.c index 1647bc4..f2377a2 100644
> --- a/drivers/input/touchscreen/ucb1400_ts.c
> +++ b/drivers/input/touchscreen/ucb1400_ts.c
> @@ -44,6 +44,25 @@ static inline void ucb1400_ts_mode_int(struct snd_ac97
> *ac97) UCB_TS_CR_MODE_INT);
>  }
>
> +static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16
> adc_channel, +		int adcsync)
> +{
> +	unsigned int val;
> +
> +	if (adcsync)
> +		adc_channel |= UCB_ADC_SYNC_ENA;
> +
> +	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
> +	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
> +			UCB_ADC_START);
> +
> +	while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
> +				& UCB_ADC_DAT_VALID))
> +		schedule_timeout_uninterruptible(1);
> +
> +	return val & UCB_ADC_DAT_MASK;
> +}
> +
>  /*
>   * Switch to pressure mode, and read pressure.  We don't need to wait
>   * here, since both plates are being driven.
> diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
> index 970473b..bf4f547 100644
> --- a/include/linux/ucb1400.h
> +++ b/include/linux/ucb1400.h
> @@ -134,25 +134,6 @@ static inline void ucb1400_adc_enable(struct snd_ac97
> *ac97) ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA);
>  }
>
> -static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16
> adc_channel, -					int adcsync)
> -{
> -	unsigned int val;
> -
> -	if (adcsync)
> -		adc_channel |= UCB_ADC_SYNC_ENA;
> -
> -	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
> -	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
> -				UCB_ADC_START);
> -
> -	while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
> -			& UCB_ADC_DAT_VALID))
> -		schedule_timeout_uninterruptible(1);
> -
> -	return val & UCB_ADC_DAT_MASK;
> -}
> -
>  static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
>  {
>  	ucb1400_reg_write(ac97, UCB_ADC_CR, 0);

Re: [PATCH] input/mfd/ucb1400: move static function from header to its user

[Sebastian Andrzej Siewior]

Marek Vasut wrote:
> On Thursday 08 of January 2009 12:07:57 Sebastian Andrzej Siewior wrote:
>> it's a little too large for static line and just static is somehow ....
>>
>> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>> ---
>> The only user I've seen is ts driver.
> 
> NAK, this is used by the battery as well (which is not merged yet, see ARM 
> linux mailing list for it)

It is not merged :) And this also in .v28.
Would you prefer me to move this function into the core instead ?

Sebastian

Re: [PATCH] input/mfd/ucb1400: move static function from header to its user

[Dmitry Torokhov]

On Thu, Jan 08, 2009 at 01:33:45PM +0100, Sebastian Andrzej Siewior wrote:
> Marek Vasut wrote:
>> On Thursday 08 of January 2009 12:07:57 Sebastian Andrzej Siewior wrote:
>>> it's a little too large for static line and just static is somehow ....
>>>
>>> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>> ---
>>> The only user I've seen is ts driver.
>>
>> NAK, this is used by the battery as well (which is not merged yet, see 
>> ARM linux mailing list for it)
>
> It is not merged :) And this also in .v28.
> Would you prefer me to move this function into the core instead ?
>

Yes, core seems to be more appropriate.

Thanks.

-- 
Dmitry

[PATCH] input/mfd/ucb1400: move static function from header into core

[Sebastian Andrzej Siewior]

it's a little too large for static line.
The ts is currently the only mainline user but Marek Vasut claims that
there is a battery driver in an ARM tree which also needs this function.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 drivers/mfd/ucb1400_core.c |   20 ++++++++++++++++++++
 include/linux/ucb1400.h    |   20 ++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
index 88f33c1..3a89e7f 100644
--- a/drivers/mfd/ucb1400_core.c
+++ b/drivers/mfd/ucb1400_core.c
@@ -23,6 +23,26 @@
 #include <linux/module.h>
 #include <linux/ucb1400.h>
 
+unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
+		int adcsync)
+{
+	unsigned int val;
+
+	if (adcsync)
+		adc_channel |= UCB_ADC_SYNC_ENA;
+
+	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
+	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
+			UCB_ADC_START);
+
+	while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
+				& UCB_ADC_DAT_VALID))
+		schedule_timeout_uninterruptible(1);
+
+	return val & UCB_ADC_DAT_MASK;
+}
+EXPORT_SYMBOL_GPL(ucb1400_adc_read);
+
 static int ucb1400_core_probe(struct device *dev)
 {
 	int err;
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index 970473b..1b0840d 100644
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -134,24 +134,8 @@ static inline void ucb1400_adc_enable(struct snd_ac97 *ac97)
 	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA);
 }
 
-static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
-					int adcsync)
-{
-	unsigned int val;
-
-	if (adcsync)
-		adc_channel |= UCB_ADC_SYNC_ENA;
-
-	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
-	ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
-				UCB_ADC_START);
-
-	while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
-			& UCB_ADC_DAT_VALID))
-		schedule_timeout_uninterruptible(1);
-
-	return val & UCB_ADC_DAT_MASK;
-}
+unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
+		int adcsync);
 
 static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
 {
-- 
1.5.6.5