Re: [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h

[Hauke Mehrtens <hauke@hauke-m.de>]

[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]

Hi Luis,

Thank you for applying the rest of the patches. Next time I will use
--cover-letter when generating the patches.

Luis R. Rodriguez wrote:
> On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>> fix build:
>> undef pcmcia_parse_tuple before redefine it again.
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>>  compat/compat-2.6.28.h |    8 +++++++-
>>  1 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
>> index fdc021a..e25259f 100644
>> --- a/compat/compat-2.6.28.h
>> +++ b/compat/compat-2.6.28.h
>> @@ -29,7 +29,13 @@
>>  })
>>  #endif /* From include/asm-generic/bug.h */
>>
>> -#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
>> +#include <pcmcia/cs_types.h>
>> +#include <pcmcia/cs.h>
>> +#include <pcmcia/cistpl.h>
>> +#ifdef pcmcia_parse_tuple
>> +#undef pcmcia_parse_tuple
>> +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
>> +#endif
> 
> Where did pccard_parse_tuple() come from?
In include/pcmcia/cistpl.h pcmcia_parse_tuple(p_dev, tuple, parse) is
defined as pccard_parse_tuple(tuple, parse)

> Did you see the commit 0df8084caf53774113c8f118e9dd43e660cf9e15 by any
> chance? That fixed compilation for me against older kernels.
I still get a compile error with recent compat-wireless including commit
0df8084caf53774113c8f118e9dd43e660cf9e15 with kernel <= 2.6.27 in Ubuntu:

In file included from
/compat-wireless-git/drivers/net/wireless/b43/pcmcia.c:30:
include/pcmcia/cistpl.h:610:1: warning: "pcmcia_parse_tuple" redefined
In file included from /compat-wireless-git/include/net/compat.h:19,
                 from <command-line>:0:
/compat-wireless-git/include/net/compat-2.6.28.h:32:1: warning: this is
the location of the previous definition

The above patch fixes it for me. The patch does not look relay nice, do
you have a better idea how to solve this problem?

Hauke


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 898 bytes --]