ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c

ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c

---
 arch/arm/mach-s3c2410/mach-h1940.c      |    4 ++--
 arch/arm/plat-s3c24xx/devs.c            |   10 +++++-----
 arch/arm/plat-samsung/include/plat/ts.h |    4 ++--
 drivers/input/touchscreen/s3c2410_ts.c  |    4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

b/arch/arm/mach-s3c2410/mach-h1940.c
index 75e3ffb..76392f2 100644

@@ -141,7 +141,7 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg

__initdata = {
.vbus_pin_inverted = 1,
};

-static struct s3c2410_ts_mach_info h1940_ts_cfg __initdata = { +static struct s3c_ts_mach_info h1940_ts_cfg __initdata = {
.delay = 10000,
.presc = 49,
.oversampling_shift = 2,
@@ -313,7 +313,7 @@ static void __init h1940_init(void)
s3c24xx_fb_set_platdata(&h1940_fb_info); s3c24xx_mci_set_platdata(&h1940_mmc_cfg); s3c24xx_udc_set_platdata(&h1940_udc_cfg);
- s3c24xx_ts_set_platdata(&h1940_ts_cfg);
+ s3c_ts_set_platdata(&h1940_ts_cfg);
s3c_i2c0_set_platdata(NULL);

/* Turn off suspend on both USB ports, and switch the

index 3e55bdd..f1c1426 100644
@@ -163,14 +163,14 @@ struct platform_device s3c_device_ts = {
 };
 EXPORT_SYMBOL(s3c_device_ts);
 
-static struct s3c2410_ts_mach_info s3c2410ts_info;
+static struct s3c_ts_mach_info s3c2410ts_info;
 
-void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info

*hard_s3c2410ts_info)
+void __init s3c_ts_set_platdata(struct s3c_ts_mach_info *hard_s3cts_info)
{
- memcpy(&s3c2410ts_info, hard_s3c2410ts_info, sizeof(struct
s3c2410_ts_mach_info));
- s3c_device_ts.dev.platform_data = &s3c2410ts_info;
+ memcpy(&s3cts_info, hard_s3cts_info, sizeof(struct s3c_ts_mach_info));
+ s3c_device_ts.dev.platform_data = &s3cts_info;
}
-EXPORT_SYMBOL(s3c24xx_ts_set_platdata); +EXPORT_SYMBOL(s3c_ts_set_platdata);

/* USB Device (Gadget)*/

b/arch/arm/plat-samsung/include/plat/ts.h
index 8a51675..ed5a1d7 100644

@@ -10,12 +10,12 @@
 #ifndef __ASM_ARM_TS_H
 #define __ASM_ARM_TS_H
 
-struct s3c2410_ts_mach_info {
+struct s3c_ts_mach_info {
        int             delay;
        int             presc;
        int             oversampling_shift;
 };
 
-extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *);
+extern void s3c_ts_set_platdata(struct s3c_ts_mach_info *);
 
 #endif /* __ASM_ARM_TS_H */

b/drivers/input/touchscreen/s3c2410_ts.c
index 0cd0ca6..3debbc2 100644

@@ -247,7 +247,7 @@ static void s3c24xx_ts_select(struct

s3c_adc_client *client, unsigned select)
*/
static int __devinit s3c2410ts_probe(struct platform_device *pdev) {
- struct s3c2410_ts_mach_info *info;
+ struct s3c_ts_mach_info *info;
struct device *dev = &pdev->dev;
struct input_dev *input_dev;
struct resource *res;
@@ -398,7 +398,7 @@ static int s3c2410ts_suspend(struct device *dev)
static int s3c2410ts_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
- struct s3c2410_ts_mach_info *info = pdev->dev.platform_data;
+ struct s3c_ts_mach_info *info = pdev->dev.platform_data;

clk_enable(ts.clock);

1.6.6.1

Renaming for naming sake is in my view just a waste of diff, unless anyone disagrees here.

Ben

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

Op 26-01-10 15:55, Ben Dooks schreef:

Well I don't think it's pointless, having s3c24xx_ts_set_platdata() and s3c2410_ts_mach_info instead of their s3c_ equivalents make it look like the API only handles s3c24xx platforms, which isn't true (anymore).

But I can remove this commit, if you want to.

Maurus Cuelenaere

Op 26-01-10 17:02, Maurus Cuelenaere schreef:

I have removed this commit and rebased the patches in my tree, will repost them when an appropriate solution for the ADC/TS resource sharing has been found.

Maurus Cuelenaere

well, even after making it s3c_ it still doesn't cover s5pxxxx(and its not just ts but other devices as well). The point is, we can't ever catch up with the SoC names.

A more soothing pov is to see newer devices as containing the ts controller of s3c2410(in this case).
If not that, then no point in renaming just ts, we should rename every other such symbol to not s3c_ but samsung_<dev>_ver_abc_
or some more compact form otherwise we fall back in the same dilemma.

Non-confusing names that you can actually remember are big plus in my eyes...
Pavel

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html