* [PATCH]pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI
@ 2010-05-20 20:40 Justin P. Mattock
2010-05-21 13:18 ` Dominik Brodowski
0 siblings, 1 reply; 3+ messages in thread
From: Justin P. Mattock @ 2010-05-20 20:40 UTC (permalink / raw)
To: linux-pcmcia; +Cc: linux-kernel, Justin P. Mattock
Seems pointless to have two #ifdef's with the same
CONFIG_YENTA_TI.. Remove the extra one and
move CARDBUS_TYPE_ENE with the others.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/pcmcia/yenta_socket.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 83ace27..5a09bbb 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -880,6 +880,12 @@ static struct cardbus_type cardbus_type[] = {
.restore_state = ti_restore_state,
.sock_init = ti_init,
},
+ [CARDBUS_TYPE_ENE] = {
+ .override = ene_override,
+ .save_state = ti_save_state,
+ .restore_state = ti_restore_state,
+ .sock_init = ti_init,
+ },
#endif
#ifdef CONFIG_YENTA_RICOH
[CARDBUS_TYPE_RICOH] = {
@@ -902,14 +908,6 @@ static struct cardbus_type cardbus_type[] = {
.restore_state = o2micro_restore_state,
},
#endif
-#ifdef CONFIG_YENTA_TI
- [CARDBUS_TYPE_ENE] = {
- .override = ene_override,
- .save_state = ti_save_state,
- .restore_state = ti_restore_state,
- .sock_init = ti_init,
- },
-#endif
};
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH]pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI
2010-05-20 20:40 [PATCH]pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI Justin P. Mattock
@ 2010-05-21 13:18 ` Dominik Brodowski
2010-05-21 17:22 ` Justin P. Mattock
0 siblings, 1 reply; 3+ messages in thread
From: Dominik Brodowski @ 2010-05-21 13:18 UTC (permalink / raw)
To: Justin P. Mattock; +Cc: linux-pcmcia, linux-kernel
Applied (see below), thanks.
Best,
Dominik
From: Justin P. Mattock <justinmattock@gmail.com>
Date: Thu, 20 May 2010 13:40:02 -0700
Subject: [PATCH] pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
Seems pointless to have two #ifdef's with the same
CONFIG_YENTA_TI.. Remove the extra one and
move CARDBUS_TYPE_ENE with the others.
[linux@dominikbrodowski.net: spelling & whitespace fixes]
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 6bf8b2c..f1d4137 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -880,6 +880,12 @@ static struct cardbus_type cardbus_type[] = {
.restore_state = ti_restore_state,
.sock_init = ti_init,
},
+ [CARDBUS_TYPE_ENE] = {
+ .override = ene_override,
+ .save_state = ti_save_state,
+ .restore_state = ti_restore_state,
+ .sock_init = ti_init,
+ },
#endif
#ifdef CONFIG_YENTA_RICOH
[CARDBUS_TYPE_RICOH] = {
@@ -902,14 +908,6 @@ static struct cardbus_type cardbus_type[] = {
.restore_state = o2micro_restore_state,
},
#endif
-#ifdef CONFIG_YENTA_TI
- [CARDBUS_TYPE_ENE] = {
- .override = ene_override,
- .save_state = ti_save_state,
- .restore_state = ti_restore_state,
- .sock_init = ti_init,
- },
-#endif
};
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH]pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI
2010-05-21 13:18 ` Dominik Brodowski
@ 2010-05-21 17:22 ` Justin P. Mattock
0 siblings, 0 replies; 3+ messages in thread
From: Justin P. Mattock @ 2010-05-21 17:22 UTC (permalink / raw)
To: linux-pcmcia, linux-kernel
On 05/21/2010 06:18 AM, Dominik Brodowski wrote:
> Applied (see below), thanks.
>
> Best,
> Dominik
>
> From: Justin P. Mattock<justinmattock@gmail.com>
> Date: Thu, 20 May 2010 13:40:02 -0700
> Subject: [PATCH] pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
>
> Seems pointless to have two #ifdef's with the same
> CONFIG_YENTA_TI.. Remove the extra one and
> move CARDBUS_TYPE_ENE with the others.
>
> [linux@dominikbrodowski.net: spelling& whitespace fixes]
> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
> Signed-off-by: Dominik Brodowski<linux@dominikbrodowski.net>
>
> diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
> index 6bf8b2c..f1d4137 100644
> --- a/drivers/pcmcia/yenta_socket.c
> +++ b/drivers/pcmcia/yenta_socket.c
> @@ -880,6 +880,12 @@ static struct cardbus_type cardbus_type[] = {
> .restore_state = ti_restore_state,
> .sock_init = ti_init,
> },
> + [CARDBUS_TYPE_ENE] = {
> + .override = ene_override,
> + .save_state = ti_save_state,
> + .restore_state = ti_restore_state,
> + .sock_init = ti_init,
> + },
> #endif
> #ifdef CONFIG_YENTA_RICOH
> [CARDBUS_TYPE_RICOH] = {
> @@ -902,14 +908,6 @@ static struct cardbus_type cardbus_type[] = {
> .restore_state = o2micro_restore_state,
> },
> #endif
> -#ifdef CONFIG_YENTA_TI
> - [CARDBUS_TYPE_ENE] = {
> - .override = ene_override,
> - .save_state = ti_save_state,
> - .restore_state = ti_restore_state,
> - .sock_init = ti_init,
> - },
> -#endif
> };
>
>
>
>
cool..
As for the problem with
pcmcia, I've my machine ready to take anything
but am in no real hurry with it(was more curious
how 2.6.34 ran on the old beast of a machine).
I'll go and send the bug report to Raphael
so he can add it to the list of regressions,
then down the line if something comes up
I can test it out or something..
Justin P. Mattock
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-21 17:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-20 20:40 [PATCH]pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI Justin P. Mattock
2010-05-21 13:18 ` Dominik Brodowski
2010-05-21 17:22 ` Justin P. Mattock
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).