From: Alistair John Strachan <s0348365@sms.ed.ac.uk>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org, torvalds@osdl.org, apkm@osdl.org
Subject: Re: PATCH: rio driver, boot code (1 of 3)
Date: Tue, 14 Feb 2006 19:38:12 +0000 [thread overview]
Message-ID: <200602141938.12041.s0348365@sms.ed.ac.uk> (raw)
In-Reply-To: <1139944938.11979.5.camel@localhost.localdomain>
On Tuesday 14 February 2006 19:22, Alan Cox wrote:
> This patch expands the HOST_DISABLE macro in rioboot.c. This is good
> anyway to remove obfuscation but also neccessary so that indent will
> process the file correctly.
>
> Signed-off-by: Alan Cox <alan@redhat.com>
>
> --- linux.vanilla-2.6.16-rc3/drivers/char/rio/rioboot.c 2006-02-14
> 17:08:55.000000000 +0000 +++
> linux-2.6.16-rc3/drivers/char/rio/rioboot.c 2006-02-14 19:07:26.551366016
> +0000 @@ -493,14 +493,10 @@
> if ( RWORD(HostP->__ParmMapR) == OldParmMap ) {
> rio_dprintk (RIO_DEBUG_BOOT, "parmmap 0x%x\n",
> RWORD(HostP->__ParmMapR)); rio_dprintk (RIO_DEBUG_BOOT, "RIO Mesg Run
> Fail\n");
> -
> -#define HOST_DISABLE \
> - HostP->Flags &= ~RUN_STATE; \
> - HostP->Flags |= RC_STUFFED; \
> - RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot );\
> - continue
> -
> - HOST_DISABLE;
> + HostP->Flags &= ~RUN_STATE; \
> + HostP->Flags |= RC_STUFFED; \
> + RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot);\
> + continue
Missing semicolon, maybe lose the \ .
> }
>
> rio_dprintk (RIO_DEBUG_BOOT, "Running 0x%x\n",
> RWORD(HostP->__ParmMapR)); @@ -528,7 +524,10 @@
> if ( (RWORD(ParmMapP->links) & 0xFFFF) != 0xFFFF ) {
> rio_dprintk (RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
> rio_dprintk (RIO_DEBUG_BOOT, "Links = 0x%x\n",RWORD(ParmMapP->links));
> - HOST_DISABLE;
> + HostP->Flags &= ~RUN_STATE; \
> + HostP->Flags |= RC_STUFFED; \
> + RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot);\
> + continue
Ditto.
> }
>
> WWORD(ParmMapP->links , RIO_LINK_ENABLE);
> @@ -550,7 +549,10 @@
> !RWORD(ParmMapP->init_done) ) {
> rio_dprintk (RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
> rio_dprintk (RIO_DEBUG_BOOT, "Timedout waiting for init_done\n");
> - HOST_DISABLE;
> + HostP->Flags &= ~RUN_STATE; \
> + HostP->Flags |= RC_STUFFED; \
> + RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot
> );\ + continue
Aaand the same.. another reason why macros like these are evil.
--
Cheers,
Alistair.
'No sense being pessimistic, it probably wouldn't work anyway.'
Third year Computer Science undergraduate.
1F2 55 South Clerk Street, Edinburgh, UK.
next prev parent reply other threads:[~2006-02-14 19:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-14 19:22 Alan Cox
2006-02-14 19:38 ` Alistair John Strachan [this message]
2006-02-14 20:08 ` Alan Cox
2006-02-14 21:02 ` Linus Torvalds
2006-02-14 23:20 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200602141938.12041.s0348365@sms.ed.ac.uk \
--to=s0348365@sms.ed.ac.uk \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=apkm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®