From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: [PATCH 1/11] ide-pmac: don't check kauai_lookup_timing() return value Date: Mon, 23 Jul 2007 07:54:04 +1000 Message-ID: <1185141244.5439.58.camel@localhost.localdomain> References: <200707222020.55609.bzolnier@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from gate.crashing.org ([63.228.1.57]:44688 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755443AbXGVVyJ (ORCPT ); Sun, 22 Jul 2007 17:54:09 -0400 In-Reply-To: <200707222020.55609.bzolnier@gmail.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Bartlomiej Zolnierkiewicz Cc: linux-ide@vger.kernel.org On Sun, 2007-07-22 at 20:20 +0200, Bartlomiej Zolnierkiewicz wrote: > kauai_lookup_timing() should always return non-zero return value: > > * BUG() in kauai_lookup_timing() if the timing info cannot be found. > > * Remove code checking for zero return value from all callers. > Acked-by: Benjamin Herrenschmidt > Signed-off-by: Bartlomiej Zolnierkiewicz > --- > patch series on top of the current IDE quilt tree > > drivers/ide/ppc/pmac.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > Index: b/drivers/ide/ppc/pmac.c > =================================================================== > --- a/drivers/ide/ppc/pmac.c > +++ b/drivers/ide/ppc/pmac.c > @@ -391,6 +391,7 @@ kauai_lookup_timing(struct kauai_timing* > for (i=0; table[i].cycle_time; i++) > if (cycle_time > table[i+1].cycle_time) > return table[i].timing_reg; > + BUG(); > return 0; > } > > @@ -636,8 +637,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive > case controller_sh_ata6: { > /* 133Mhz cell */ > u32 tr = kauai_lookup_timing(shasta_pio_timings, cycle_time); > - if (tr == 0) > - return; > *timings = ((*timings) & ~TR_133_PIOREG_PIO_MASK) | tr; > break; > } > @@ -645,8 +644,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive > case controller_k2_ata6: { > /* 100Mhz cell */ > u32 tr = kauai_lookup_timing(kauai_pio_timings, cycle_time); > - if (tr == 0) > - return; > *timings = ((*timings) & ~TR_100_PIOREG_PIO_MASK) | tr; > break; > } > @@ -745,8 +742,6 @@ set_timings_udma_ata6(u32 *pio_timings, > if (speed > XFER_UDMA_5 || t == NULL) > return 1; > tr = kauai_lookup_timing(kauai_udma_timings, (int)t->udma); > - if (tr == 0) > - return 1; > *ultra_timings = ((*ultra_timings) & ~TR_100_UDMAREG_UDMA_MASK) | tr; > *ultra_timings = (*ultra_timings) | TR_100_UDMAREG_UDMA_EN; > > @@ -765,8 +760,6 @@ set_timings_udma_shasta(u32 *pio_timings > if (speed > XFER_UDMA_6 || t == NULL) > return 1; > tr = kauai_lookup_timing(shasta_udma133_timings, (int)t->udma); > - if (tr == 0) > - return 1; > *ultra_timings = ((*ultra_timings) & ~TR_133_UDMAREG_UDMA_MASK) | tr; > *ultra_timings = (*ultra_timings) | TR_133_UDMAREG_UDMA_EN; > > @@ -838,8 +831,6 @@ set_timings_mdma(ide_drive_t *drive, int > case controller_sh_ata6: { > /* 133Mhz cell */ > u32 tr = kauai_lookup_timing(shasta_mdma_timings, cycleTime); > - if (tr == 0) > - return 1; > *timings = ((*timings) & ~TR_133_PIOREG_MDMA_MASK) | tr; > *timings2 = (*timings2) & ~TR_133_UDMAREG_UDMA_EN; > } > @@ -847,8 +838,6 @@ set_timings_mdma(ide_drive_t *drive, int > case controller_k2_ata6: { > /* 100Mhz cell */ > u32 tr = kauai_lookup_timing(kauai_mdma_timings, cycleTime); > - if (tr == 0) > - return 1; > *timings = ((*timings) & ~TR_100_PIOREG_MDMA_MASK) | tr; > *timings2 = (*timings2) & ~TR_100_UDMAREG_UDMA_EN; > }