diff for duplicates of <20080112053630.0ccb290e.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index 426ff69..f3468b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ On Fri, 11 Jan 2008 21:56:49 +0000 Adrian McMenamin <adrian@newgolddream.dyndns. > + > +static bool gdrom_data_request(void) > +{ -> + return (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) = 8; +> + return (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) == 8; > +} > + > +static void gdrom_wait_clrbusy(void) @@ -119,7 +119,7 @@ So this function can busywait for three minutes. > + gd.pending = 1; > + gdrom_packetcommand(gd.cd_info, spin_command); > + /* 60 second timeout */ -> + wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +> + wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); > + gd.pending = 0; > + kfree(spin_command); > + if (gd.status & 0x01) { @@ -159,7 +159,7 @@ yielding or something similarly weird. > + toc_command->buflen = tocsize; > + gd.pending = 1; > + gdrom_packetcommand(gd.cd_info, toc_command); -> + wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +> + wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); > + gd.pending = 0; > + insw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2); > + kfree(toc_command); @@ -209,7 +209,7 @@ above, you may choose to fix. Some you definitely will. > + gd.pending = 1; > + gdrom_packetcommand(gd.cd_info, sense_command); > + /* 60 second timeout */ -> + wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +> + wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); > + gd.pending = 0; > + kfree(sense_command); @@ -307,7 +307,7 @@ Are all these busy waits really unavoidable? > + ctrl_outb(1, GDROM_DMA_STATUS_REG); > + /* 5 second error margin here seems more reasonable */ -> + wait_event_interruptible_timeout(request_queue, gd.transfer = 0, HZ * 5); +> + wait_event_interruptible_timeout(request_queue, gd.transfer == 0, HZ * 5); > + err = gd.transfer; > + gd.transfer = 0; > + gd.pending = 0; diff --git a/a/content_digest b/N1/content_digest index ddf94db..195093d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01200007549.6349.16.camel@localhost.localdomain\0" "ref\01200088609.6213.3.camel@localhost.localdomain\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" - "Subject\0Re: [PATCH] SH/Dreamcast - add support for GD-Rom CDROM drive on\0" - "Date\0Sat, 12 Jan 2008 13:36:30 +0000\0" + "Subject\0Re: [PATCH] SH/Dreamcast - add support for GD-Rom CDROM drive on SEGA Dreamcast\0" + "Date\0Sat, 12 Jan 2008 05:36:30 -0800\0" "To\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Cc\0Jens Axboe <jens.axboe@oracle.com>" Paul Mundt <lethal@linux-sh.org> @@ -31,7 +31,7 @@ "> +\n" "> +static bool gdrom_data_request(void)\n" "> +{\n" - "> + \treturn (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) = 8;\n" + "> + \treturn (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) == 8;\n" "> +}\n" "> +\n" "> +static void gdrom_wait_clrbusy(void)\n" @@ -131,7 +131,7 @@ "> +\tgd.pending = 1;\n" "> +\tgdrom_packetcommand(gd.cd_info, spin_command);\n" "> +\t/* 60 second timeout */\n" - "> +\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "> +\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "> +\tgd.pending = 0;\n" "> +\tkfree(spin_command);\n" "> +\tif (gd.status & 0x01) {\n" @@ -171,7 +171,7 @@ "> +\ttoc_command->buflen = tocsize;\n" "> +\tgd.pending = 1;\n" "> +\tgdrom_packetcommand(gd.cd_info, toc_command);\n" - "> +\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "> +\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "> +\tgd.pending = 0;\n" "> +\tinsw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2);\n" "> +\tkfree(toc_command);\n" @@ -221,7 +221,7 @@ "> +\tgd.pending = 1;\n" "> +\tgdrom_packetcommand(gd.cd_info, sense_command);\n" "> +\t/* 60 second timeout */\n" - "> +\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "> +\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "> +\tgd.pending = 0;\n" "> +\tkfree(sense_command);\n" "\n" @@ -319,7 +319,7 @@ "\n" "> +\t\tctrl_outb(1, GDROM_DMA_STATUS_REG);\n" "> +\t\t/* 5 second error margin here seems more reasonable */\n" - "> +\t\twait_event_interruptible_timeout(request_queue, gd.transfer = 0, HZ * 5);\n" + "> +\t\twait_event_interruptible_timeout(request_queue, gd.transfer == 0, HZ * 5);\n" "> +\t\terr = gd.transfer;\n" "> +\t\tgd.transfer = 0;\n" "> +\t\tgd.pending = 0;\n" @@ -347,4 +347,4 @@ "no possibility that this work item is still pending (or running) after\n" device close, during suspend, after rmmod, etc? -664608a662031d23620ff02d9b356f167cd3bd919a39dedbd6476570aa31ce7f +264b9b4aeacb5c5f45aef735b8dc4cda6338c38b412aa664abdc6f316ea2f8f5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.