2002-01-25 00:22:54

by Jean Tourrilhes

[permalink] [raw]
Subject: [PATCH] Trigraph warning cleanup for wavelan_cs in 2.5.3-pre5

Hi Linus,

This is a trivial patch that fixes some trigraph warning and
was a leftover of the driver backport. I think adding that to your
tree would please Jeff.

By the way : I've checked all the Config.help entries for
Wireless LANs and IrDA, and they seem to be in the right place (at
least, for "make config" only).

Regards,

Jean

------------------------------------------------------------

diff -u -p -r linux/drivers/net/wireless.v23/wavelan_cs.c linux/drivers/net/wireless/wavelan_cs.c
--- linux/drivers/net/wireless.v23/wavelan_cs.c Thu Jan 17 10:48:59 2002
+++ linux/drivers/net/wireless/wavelan_cs.c Fri Jan 18 10:36:22 2002
@@ -797,7 +797,7 @@ static inline void wl_roam_gather(device
wavepoint_history *wavepoint=NULL; /* WavePoint table entry */
net_local *lp=(net_local *)dev->priv; /* Device info */

-#if 0
+#ifdef I_NEED_THIS_FEATURE
/* Some people don't need this, some other may need it */
nwid=nwid^ntohs(beacon->domain_id);
#endif
@@ -1417,7 +1417,7 @@ wv_init_info(device * dev)
printk("2430.5");
break;
default:
- printk("???");
+ printk("unknown");
}
}

@@ -1732,7 +1732,7 @@ wv_set_frequency(u_long base, /* i/o po
memcmp(dac, dac_verify, 2 * 2))
{
#ifdef DEBUG_IOCTL_ERROR
- printk(KERN_INFO "Wavelan: wv_set_frequency : unable to write new frequency to EEprom (??)\n");
+ printk(KERN_INFO "Wavelan: wv_set_frequency : unable to write new frequency to EEprom (?)\n");
#endif
return -EOPNOTSUPP;
}
@@ -1981,7 +1981,7 @@ wavelan_ioctl(struct net_device * dev, /

case SIOCGIWFREQ:
/* Attempt to recognise 2.00 cards (2.4 GHz frequency selectable)
- * (does it work for everybody ??? - especially old cards...) */
+ * (does it work for everybody ? - especially old cards...) */
if(!(mmc_in(base, mmroff(0, mmr_fee_status)) &
(MMR_FEE_STATUS_DWLD | MMR_FEE_STATUS_BUSY)))
{
@@ -3163,7 +3163,7 @@ wv_mmc_init(device * dev)
*/

/* Attempt to recognise 2.00 cards (2.4 GHz frequency selectable)
- * (does it work for everybody ??? - especially old cards...) */
+ * (does it work for everybody ? - especially old cards...) */
/* Note : WFREQSEL verify that it is able to read from EEprom
* a sensible frequency (address 0x00) + that MMR_FEE_STATUS_ID
* is 0xA (Xilinx version) or 0xB (Ariadne version).
@@ -4718,7 +4718,7 @@ wavelan_event(event_t event, /* The ev
* obliged to close nicely the wavelan here. David, could you
* close the device before suspending them ? And, by the way,
* could you, on resume, add a "route add -net ..." after the
- * ifconfig up ??? Thanks... */
+ * ifconfig up ? Thanks... */

/* Stop receiving new messages and wait end of transmission */
wv_ru_stop(dev);
@@ -4745,7 +4745,7 @@ wavelan_event(event_t event, /* The ev
if(link->state & DEV_CONFIG)
{
CardServices(RequestConfiguration, link->handle, &link->conf);
- if(link->open) /* If RESET -> True, If RESUME -> False ??? */
+ if(link->open) /* If RESET -> True, If RESUME -> False ? */
{
wv_hw_reset(dev);
netif_device_attach(dev);


2002-01-25 00:39:46

by Benjamin LaHaise

[permalink] [raw]
Subject: Re: [PATCH] Trigraph warning cleanup for wavelan_cs in 2.5.3-pre5

On Thu, Jan 24, 2002 at 04:22:33PM -0800, Jean Tourrilhes wrote:
> Hi Linus,
>
> This is a trivial patch that fixes some trigraph warning and
> was a leftover of the driver backport. I think adding that to your
> tree would please Jeff.

Doesn't -Wno-trigraphs in the top level makefile avoid this? Or is the
file in question not being complied with the correct flags?

-ben


2002-01-25 00:42:26

by Jean Tourrilhes

[permalink] [raw]
Subject: Re: [PATCH] Trigraph warning cleanup for wavelan_cs in 2.5.3-pre5

On Thu, Jan 24, 2002 at 07:39:25PM -0500, Benjamin LaHaise wrote:
> On Thu, Jan 24, 2002 at 04:22:33PM -0800, Jean Tourrilhes wrote:
> > Hi Linus,
> >
> > This is a trivial patch that fixes some trigraph warning and
> > was a leftover of the driver backport. I think adding that to your
> > tree would please Jeff.
>
> Doesn't -Wno-trigraphs in the top level makefile avoid this? Or is the
> file in question not being complied with the correct flags?
>
> -ben

I have no idea, I've nevern seen that on my boxes. Jeff Garzik
told me that I had to do this, so as it was only cosmetic, I just did
the patch. Please ask him for details...

Jean

2002-01-25 22:02:56

by Jeff Garzik

[permalink] [raw]
Subject: Re: [PATCH] Trigraph warning cleanup for wavelan_cs in 2.5.3-pre5

The warnings came from building with gcc-3.1-cvs maybe 3 or 4 months
ago...
--
Jeff Garzik | "I went through my candy like hot oatmeal
Building 1024 | through an internally-buttered weasel."
MandrakeSoft | - goats.com