| Message ID | 20100118171427.14623.34958.sendpatchset@localhost |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 01/18/2010 12:14 PM, Bartlomiej Zolnierkiewicz wrote: > From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > Subject: [PATCH] pata_atiixp: remove superfluous wrapper function > > Fix documentation for ->set_[pio,dma]mode methods while at it. > > Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > --- > drivers/ata/pata_atiixp.c | 29 +++++++---------------------- > 1 file changed, 7 insertions(+), 22 deletions(-) applied -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/20/2010 11:07 PM, Jeff Garzik wrote: > On 01/18/2010 12:14 PM, Bartlomiej Zolnierkiewicz wrote: >> From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> >> Subject: [PATCH] pata_atiixp: remove superfluous wrapper function >> >> Fix documentation for ->set_[pio,dma]mode methods while at it. >> >> Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> >> --- >> drivers/ata/pata_atiixp.c | 29 +++++++---------------------- >> 1 file changed, 7 insertions(+), 22 deletions(-) > > applied undone... it broke the build, presumably because it requires something in your tree that's not in libata-dev.git -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday 21 January 2010 05:09:09 am Jeff Garzik wrote: > On 01/20/2010 11:07 PM, Jeff Garzik wrote: > > On 01/18/2010 12:14 PM, Bartlomiej Zolnierkiewicz wrote: > >> From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > >> Subject: [PATCH] pata_atiixp: remove superfluous wrapper function > >> > >> Fix documentation for ->set_[pio,dma]mode methods while at it. > >> > >> Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > >> --- > >> drivers/ata/pata_atiixp.c | 29 +++++++---------------------- > >> 1 file changed, 7 insertions(+), 22 deletions(-) > > > > applied > > undone... it broke the build, presumably because it requires something > in your tree that's not in libata-dev.git Jeff, as noted in the first mail those patches are against atang tree (which has many changes which are missing from your libata-dev tree).. -- Bartlomiej Zolnierkiewicz -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/21/2010 06:23 AM, Bartlomiej Zolnierkiewicz wrote: > On Thursday 21 January 2010 05:09:09 am Jeff Garzik wrote: >> On 01/20/2010 11:07 PM, Jeff Garzik wrote: >>> On 01/18/2010 12:14 PM, Bartlomiej Zolnierkiewicz wrote: >>>> From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> >>>> Subject: [PATCH] pata_atiixp: remove superfluous wrapper function >>>> >>>> Fix documentation for ->set_[pio,dma]mode methods while at it. >>>> >>>> Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> >>>> --- >>>> drivers/ata/pata_atiixp.c | 29 +++++++---------------------- >>>> 1 file changed, 7 insertions(+), 22 deletions(-) >>> >>> applied >> >> undone... it broke the build, presumably because it requires something >> in your tree that's not in libata-dev.git > > Jeff, as noted in the first mail those patches are against atang tree > (which has many changes which are missing from your libata-dev tree).. Yes, hence "presumably because it requires something in your tree" Would you be willing to submit a push against the latest libata-dev.git#upstream? Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: b/drivers/ata/pata_atiixp.c =================================================================== --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c @@ -72,22 +72,22 @@ static int atiixp_prereset(struct ata_li } /** - * atiixp_set_pio_timing - set initial PIO mode data + * atiixp_set_piomode - set PIO mode data * @ap: ATA interface * @adev: ATA device * - * Called by both the pio and dma setup functions to set the controller - * timings for PIO transfers. We must load both the mode number and - * timing values into the controller. + * Called to set the controller timings for PIO transfers. We must + * load both the mode number and timing values into the controller. */ -static void atiixp_set_pio_timing(struct ata_port *ap, struct ata_device *adev, int pio) +static void atiixp_set_piomode(struct ata_port *ap, struct ata_device *adev) { static u8 pio_timings[5] = { 0x5D, 0x47, 0x34, 0x22, 0x20 }; struct pci_dev *pdev = to_pci_dev(ap->host->dev); int dn = 2 * ap->port_no + adev->devno; int timing_shift = (16 * ap->port_no) + 8 * (adev->devno ^ 1); + int pio = adev->pio_mode - XFER_PIO_0; u32 pio_timing_data; u16 pio_mode_data; @@ -103,26 +103,11 @@ static void atiixp_set_pio_timing(struct } /** - * atiixp_set_piomode - set initial PIO mode data - * @ap: ATA interface - * @adev: ATA device - * - * Called to do the PIO mode setup. We use a shared helper for this - * as the DMA setup must also adjust the PIO timing information. - */ - -static void atiixp_set_piomode(struct ata_port *ap, struct ata_device *adev) -{ - atiixp_set_pio_timing(ap, adev, adev->pio_mode - XFER_PIO_0); -} - -/** - * atiixp_set_dmamode - set initial DMA mode data + * atiixp_set_dmamode - set DMA mode data * @ap: ATA interface * @adev: ATA device * - * Called to do the DMA mode setup. We use timing tables for most - * modes but must tune an appropriate PIO mode to match. + * Called to do the DMA mode setup. */ static void atiixp_set_dmamode(struct ata_port *ap, struct ata_device *adev)