* [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
@ 2010-01-22 22:47 Maurus Cuelenaere
2010-01-26 14:55 ` Ben Dooks
0 siblings, 1 reply; 6+ messages in thread
From: Maurus Cuelenaere @ 2010-01-22 22:47 UTC (permalink / raw)
To: linux-arm-kernel
ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
---
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(-)
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c
b/arch/arm/mach-s3c2410/mach-h1940.c
index 75e3ffb..76392f2 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -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
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 3e55bdd..f1c1426 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -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)*/
diff --git a/arch/arm/plat-samsung/include/plat/ts.h
b/arch/arm/plat-samsung/include/plat/ts.h
index 8a51675..ed5a1d7 100644
--- a/arch/arm/plat-samsung/include/plat/ts.h
+++ b/arch/arm/plat-samsung/include/plat/ts.h
@@ -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 */
diff --git a/drivers/input/touchscreen/s3c2410_ts.c
b/drivers/input/touchscreen/s3c2410_ts.c
index 0cd0ca6..3debbc2 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
2010-01-22 22:47 [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c Maurus Cuelenaere
@ 2010-01-26 14:55 ` Ben Dooks
2010-01-26 16:02 ` Maurus Cuelenaere
2010-01-31 18:11 ` Pavel Machek
0 siblings, 2 replies; 6+ messages in thread
From: Ben Dooks @ 2010-01-26 14:55 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 22, 2010 at 11:47:11PM +0100, Maurus Cuelenaere wrote:
> ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
>
> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
2010-01-26 14:55 ` Ben Dooks
@ 2010-01-26 16:02 ` Maurus Cuelenaere
2010-01-27 0:32 ` Maurus Cuelenaere
2010-01-27 0:32 ` jassi brar
2010-01-31 18:11 ` Pavel Machek
1 sibling, 2 replies; 6+ messages in thread
From: Maurus Cuelenaere @ 2010-01-26 16:02 UTC (permalink / raw)
To: linux-arm-kernel
Op 26-01-10 15:55, Ben Dooks schreef:
> On Fri, Jan 22, 2010 at 11:47:11PM +0100, Maurus Cuelenaere wrote:
>
>> ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
>>
>> Signed-off-by: Maurus Cuelenaere<mcuelenaere@gmail.com>
>>
> Renaming for naming sake is in my view just a waste of diff, unless
> anyone disagrees here.
>
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
2010-01-26 16:02 ` Maurus Cuelenaere
@ 2010-01-27 0:32 ` Maurus Cuelenaere
2010-01-27 0:32 ` jassi brar
1 sibling, 0 replies; 6+ messages in thread
From: Maurus Cuelenaere @ 2010-01-27 0:32 UTC (permalink / raw)
To: linux-arm-kernel
Op 26-01-10 17:02, Maurus Cuelenaere schreef:
> Op 26-01-10 15:55, Ben Dooks schreef:
>> On Fri, Jan 22, 2010 at 11:47:11PM +0100, Maurus Cuelenaere wrote:
>>> ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
>>>
>>> Signed-off-by: Maurus Cuelenaere<mcuelenaere@gmail.com>
>> Renaming for naming sake is in my view just a waste of diff, unless
>> anyone disagrees here.
>
> 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.
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
2010-01-26 16:02 ` Maurus Cuelenaere
2010-01-27 0:32 ` Maurus Cuelenaere
@ 2010-01-27 0:32 ` jassi brar
1 sibling, 0 replies; 6+ messages in thread
From: jassi brar @ 2010-01-27 0:32 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 27, 2010 at 1:02 AM, Maurus Cuelenaere
<mcuelenaere@gmail.com> wrote:
> Op 26-01-10 15:55, Ben Dooks schreef:
>>
>> On Fri, Jan 22, 2010 at 11:47:11PM +0100, Maurus Cuelenaere wrote:
>>
>>>
>>> ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
>>>
>>> Signed-off-by: Maurus Cuelenaere<mcuelenaere@gmail.com>
>>>
>>
>> Renaming for naming sake is in my view just a waste of diff, unless
>> anyone disagrees here.
>>
>
> 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).
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
2010-01-26 14:55 ` Ben Dooks
2010-01-26 16:02 ` Maurus Cuelenaere
@ 2010-01-31 18:11 ` Pavel Machek
1 sibling, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2010-01-31 18:11 UTC (permalink / raw)
To: linux-arm-kernel
On Tue 2010-01-26 14:55:58, Ben Dooks wrote:
> On Fri, Jan 22, 2010 at 11:47:11PM +0100, Maurus Cuelenaere wrote:
> > ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c
> >
> > Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
>
> Renaming for naming sake is in my view just a waste of diff, unless
> anyone disagrees here.
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-01-31 18:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-22 22:47 [PATCH 2/4] ARM: SAMSUNG: Rename s3c24xx touchscreen interface to s3c Maurus Cuelenaere
2010-01-26 14:55 ` Ben Dooks
2010-01-26 16:02 ` Maurus Cuelenaere
2010-01-27 0:32 ` Maurus Cuelenaere
2010-01-27 0:32 ` jassi brar
2010-01-31 18:11 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).