From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brad Boyer Subject: Re: [PATCH] Macintosh: fix brace and trailing statement coding style issues in adb-iop.c This is a patch to the adb-iop.c file that cleans up brace and trailing statement warnings found by the checkpatch.pl tool. Signed-off-by: Michael Beardsworth Date: Sat, 20 Mar 2010 16:08:01 -0700 Message-ID: <20100320230801.GA5000@cynthia.pants.nu> References: <1268171180-75624-1-git-send-email-mbeards2@uoregon.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [76.245.85.235] ([76.245.85.235]:34319 "EHLO cynthia.pants.nu" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752759Ab0CTXvG (ORCPT ); Sat, 20 Mar 2010 19:51:06 -0400 Content-Disposition: inline In-Reply-To: <1268171180-75624-1-git-send-email-mbeards2@uoregon.edu> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Michael Beardsworth Cc: benh@kernel.crashing.or, linuxppc-dev@ozlabs.org, Michael Beardsworth , linux-m68k@vger.kernel.org This driver is for m68k based Macintosh systems, not PowerPC based ones. I'm copying the linux-m68k list on this reply so it is seen there as well. Brad Boyer flar@allandria.com On Tue, Mar 09, 2010 at 01:46:20PM -0800, Michael Beardsworth wrote: > From: Michael Beardsworth > > --- > drivers/macintosh/adb-iop.c | 41 +++++++++++++++++++++++------------------ > 1 files changed, 23 insertions(+), 18 deletions(-) > > diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c > index 4446966..e813589 100644 > --- a/drivers/macintosh/adb-iop.c > +++ b/drivers/macintosh/adb-iop.c > @@ -19,13 +19,13 @@ > #include > #include > > -#include > -#include > +#include > +#include > #include > #include > #include > > -#include > +#include > > /*#define DEBUG_ADB_IOP*/ > > @@ -67,7 +67,8 @@ static void adb_iop_end_req(struct adb_request *req, int state) > { > req->complete = 1; > current_req = req->next; > - if (req->done) (*req->done)(req); > + if (req->done) > + (*req->done)(req); > adb_iop_state = state; > } > > @@ -85,9 +86,8 @@ static void adb_iop_complete(struct iop_msg *msg) > local_irq_save(flags); > > req = current_req; > - if ((adb_iop_state == sending) && req && req->reply_expected) { > + if ((adb_iop_state == sending) && req && req->reply_expected) > adb_iop_state = awaiting_reply; > - } > > local_irq_restore(flags); > } > @@ -113,8 +113,8 @@ static void adb_iop_listen(struct iop_msg *msg) > req = current_req; > > #ifdef DEBUG_ADB_IOP > - printk("adb_iop_listen %p: rcvd packet, %d bytes: %02X %02X", req, > - (uint) amsg->count + 2, (uint) amsg->flags, (uint) amsg->cmd); > + printk(KERN_WARNING "adb_iop_listen %p: rcvd packet, %d bytes: %02X %02X", > + req, (uint) amsg->count + 2, (uint) amsg->flags, (uint) amsg->cmd); > for (i = 0; i < amsg->count; i++) > printk(" %02X", (uint) amsg->data[i]); > printk("\n"); > @@ -130,9 +130,8 @@ static void adb_iop_listen(struct iop_msg *msg) > msg->reply[0] = ADB_IOP_TIMEOUT | ADB_IOP_AUTOPOLL; > msg->reply[1] = 0; > msg->reply[2] = 0; > - if (req && (adb_iop_state != idle)) { > + if (req && (adb_iop_state != idle)) > adb_iop_end_req(req, idle); > - } > } else { > /* TODO: is it possible for more than one chunk of data */ > /* to arrive before the timeout? If so we need to */ > @@ -169,12 +168,13 @@ static void adb_iop_start(void) > > /* get the packet to send */ > req = current_req; > - if (!req) return; > + if (!req) > + return; > > local_irq_save(flags); > > #ifdef DEBUG_ADB_IOP > - printk("adb_iop_start %p: sending packet, %d bytes:", req, req->nbytes); > + printk(KERN_WARNING "adb_iop_start %p: sending packet, %d bytes:", req, req->nbytes); > for (i = 0 ; i < req->nbytes ; i++) > printk(" %02X", (uint) req->data[i]); > printk("\n"); > @@ -203,13 +203,14 @@ static void adb_iop_start(void) > > int adb_iop_probe(void) > { > - if (!iop_ism_present) return -ENODEV; > + if (!iop_ism_present) > + return -ENODEV; > return 0; > } > > int adb_iop_init(void) > { > - printk("adb: IOP ISM driver v0.4 for Unified ADB.\n"); > + printk(KERN_MESSAGE "adb: IOP ISM driver v0.4 for Unified ADB.\n"); > iop_listen(ADB_IOP, ADB_CHAN, adb_iop_listen, "ADB"); > return 0; > } > @@ -219,10 +220,12 @@ int adb_iop_send_request(struct adb_request *req, int sync) > int err; > > err = adb_iop_write(req); > - if (err) return err; > + if (err) > + return err; > > if (sync) { > - while (!req->complete) adb_iop_poll(); > + while (!req->complete) > + adb_iop_poll(); > } > return 0; > } > @@ -252,7 +255,8 @@ static int adb_iop_write(struct adb_request *req) > } > > local_irq_restore(flags); > - if (adb_iop_state == idle) adb_iop_start(); > + if (adb_iop_state == idle) > + adb_iop_start(); > return 0; > } > > @@ -264,7 +268,8 @@ int adb_iop_autopoll(int devs) > > void adb_iop_poll(void) > { > - if (adb_iop_state == idle) adb_iop_start(); > + if (adb_iop_state == idle) > + adb_iop_start(); > iop_ism_irq(0, (void *) ADB_IOP); > } > > -- > 1.6.5 > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev