[PATCH] s3c: Fix adc function exports

[PATCH] s3c: Fix adc function exports

[Ryan Mallon]

A couple of mistakes were picked up in the s3c adc driver during the
review of Christian Gagneraud's ep93xx adc patches.

---
Make s3c_adc_start static since it is not used by any other driver, and
fix the export of s3c_adc_read.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
---

diff --git a/arch/arm/plat-s3c/include/plat/adc.h b/arch/arm/plat-s3c/include/plat/adc.h
index 5f3b1cd..9ae61a1 100644
--- a/arch/arm/plat-s3c/include/plat/adc.h
+++ b/arch/arm/plat-s3c/include/plat/adc.h
@@ -16,9 +16,6 @@
 
 struct s3c_adc_client;
 
-extern int s3c_adc_start(struct s3c_adc_client *client,
-			 unsigned int channel, unsigned int nr_samples);
-
 extern int s3c_adc_read(struct s3c_adc_client *client, unsigned int ch);
 
 extern struct s3c_adc_client *
diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
index 4d36b78..f81c539 100644
--- a/arch/arm/plat-s3c24xx/adc.c
+++ b/arch/arm/plat-s3c24xx/adc.c
@@ -125,8 +125,8 @@ static void s3c_adc_try(struct adc_device *adc)
 	}
 }
 
-int s3c_adc_start(struct s3c_adc_client *client,
-		  unsigned int channel, unsigned int nr_samples)
+static int s3c_adc_start(struct s3c_adc_client *client,
+			 unsigned int channel, unsigned int nr_samples)
 {
 	struct adc_device *adc = adc_dev;
 	unsigned long flags;
@@ -155,7 +155,6 @@ int s3c_adc_start(struct s3c_adc_client *client,
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(s3c_adc_start);
 
 static void s3c_convert_done(struct s3c_adc_client *client,
 			     unsigned v, unsigned u, unsigned *left)
@@ -189,7 +188,7 @@ int s3c_adc_read(struct s3c_adc_client *client, unsigned int ch)
 err:
 	return ret;
 }
-EXPORT_SYMBOL_GPL(s3c_adc_convert);
+EXPORT_SYMBOL_GPL(s3c_adc_read);
 
 static void s3c_adc_default_select(struct s3c_adc_client *client,
 				   unsigned select)

[PATCH] s3c: Fix adc function exports

[Ben Dooks]

On Wed, Oct 14, 2009 at 09:18:30AM +1300, Ryan Mallon wrote:
> A couple of mistakes were picked up in the s3c adc driver during the
> review of Christian Gagneraud's ep93xx adc patches.
 
> ---
> Make s3c_adc_start static since it is not used by any other driver, and
> fix the export of s3c_adc_read.

s3c_adc_start is used by ts driver which is under review, so please don't
remove it. The other part is correct, I'll chop and apply.
 
> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
> ---
> 
> diff --git a/arch/arm/plat-s3c/include/plat/adc.h b/arch/arm/plat-s3c/include/plat/adc.h
> index 5f3b1cd..9ae61a1 100644
> --- a/arch/arm/plat-s3c/include/plat/adc.h
> +++ b/arch/arm/plat-s3c/include/plat/adc.h
> @@ -16,9 +16,6 @@
>  
>  struct s3c_adc_client;
>  
> -extern int s3c_adc_start(struct s3c_adc_client *client,
> -			 unsigned int channel, unsigned int nr_samples);
> -
>  extern int s3c_adc_read(struct s3c_adc_client *client, unsigned int ch);
>  
>  extern struct s3c_adc_client *
> diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
> index 4d36b78..f81c539 100644
> --- a/arch/arm/plat-s3c24xx/adc.c
> +++ b/arch/arm/plat-s3c24xx/adc.c
> @@ -125,8 +125,8 @@ static void s3c_adc_try(struct adc_device *adc)
>  	}
>  }
>  
> -int s3c_adc_start(struct s3c_adc_client *client,
> -		  unsigned int channel, unsigned int nr_samples)
> +static int s3c_adc_start(struct s3c_adc_client *client,
> +			 unsigned int channel, unsigned int nr_samples)
>  {
>  	struct adc_device *adc = adc_dev;
>  	unsigned long flags;
> @@ -155,7 +155,6 @@ int s3c_adc_start(struct s3c_adc_client *client,
>  
>  	return 0;
>  }
> -EXPORT_SYMBOL_GPL(s3c_adc_start);
>  
>  static void s3c_convert_done(struct s3c_adc_client *client,
>  			     unsigned v, unsigned u, unsigned *left)
> @@ -189,7 +188,7 @@ int s3c_adc_read(struct s3c_adc_client *client, unsigned int ch)
>  err:
>  	return ret;
>  }
> -EXPORT_SYMBOL_GPL(s3c_adc_convert);
> +EXPORT_SYMBOL_GPL(s3c_adc_read);
>  
>  static void s3c_adc_default_select(struct s3c_adc_client *client,
>  				   unsigned select)
> 

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH] s3c: Fix adc function exports

[Ryan Mallon]

Ben Dooks wrote:
> On Wed, Oct 14, 2009 at 09:18:30AM +1300, Ryan Mallon wrote:
>> A couple of mistakes were picked up in the s3c adc driver during the
>> review of Christian Gagneraud's ep93xx adc patches.
>  
>> ---
>> Make s3c_adc_start static since it is not used by any other driver, and
>> fix the export of s3c_adc_read.
> 
> s3c_adc_start is used by ts driver which is under review, so please don't
> remove it. The other part is correct, I'll chop and apply.

Okay, thanks. I take it you are applying to your tree, I don't need to
fix and submit to the patch system?

~Ryan

-- 
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com	New Zealand
Phone: +64 3 3779127		Freecall: Australia 1800 148 751
Fax:   +64 3 3779135			  USA 1800 261 2934

[PATCH] s3c: Fix adc function exports

[Ben Dooks]

On Wed, Oct 14, 2009 at 09:25:20AM +1300, Ryan Mallon wrote:
> Ben Dooks wrote:
> > On Wed, Oct 14, 2009 at 09:18:30AM +1300, Ryan Mallon wrote:
> >> A couple of mistakes were picked up in the s3c adc driver during the
> >> review of Christian Gagneraud's ep93xx adc patches.
> >  
> >> ---
> >> Make s3c_adc_start static since it is not used by any other driver, and
> >> fix the export of s3c_adc_read.
> > 
> > s3c_adc_start is used by ts driver which is under review, so please don't
> > remove it. The other part is correct, I'll chop and apply.
> 
> Okay, thanks. I take it you are applying to your tree, I don't need to
> fix and submit to the patch system?

I've applied this to next-s3c24xx-fixes, and will try and push it upstream
once I've returned from ELC09 next week.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.