Re: [PATCH 7/9] cs5536: convert to ide2libata

[Jeff Garzik]

On 01/30/2010 02:50 PM, Bartlomiej Zolnierkiewicz wrote:
> From: Bartlomiej Zolnierkiewicz<bzolnier@xxxxxxxxx>
> Subject: [PATCH] cs5536: convert to ide2libata
>
> Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@xxxxxxxxx>
> ---
>   drivers/ata/pata_cs5536.h |   22 +++++
>   drivers/ide/cs5536.c      |  189 +---------------------------------------------
>   2 files changed, 26 insertions(+), 185 deletions(-)
>
> Index: b/drivers/ata/pata_cs5536.h
> ===================================================================
> --- a/drivers/ata/pata_cs5536.h
> +++ b/drivers/ata/pata_cs5536.h
> @@ -64,7 +64,11 @@ static int cs5536_write(struct pci_dev *
>
>   static void cs5536_program_dtc(struct ata_device *adev, u8 tim)
>   {
> +#ifndef __IDE2LIBATA
>   	struct pci_dev *pdev = to_pci_dev(adev->link->ap->host->dev);
> +#else
> +	struct pci_dev *pdev = to_pci_dev(adev->hwif->dev);
> +#endif
>   	int dshift = adev->devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;
>   	u32 dtc;
>
> @@ -121,11 +125,19 @@ static void cs5536_set_piomode(struct at
>   	int mode = adev->pio_mode - XFER_PIO_0;
>   	int cmdmode = mode;
>   	int cshift = adev->devno ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;
> +#ifdef __IDE2LIBATA
> +	unsigned long timings = (unsigned long)ide_get_drivedata(adev);
> +#endif
>   	u32 cast;
>
>   	if (pair)
>   		cmdmode = min(mode, pair->pio_mode - XFER_PIO_0);
>
> +#ifdef __IDE2LIBATA
> +	timings&= (IDE_DRV_MASK<<  8);
> +	timings |= drv_timings[mode];
> +	ide_set_drivedata(adev, (void *)timings);
> +#endif
>   	cs5536_program_dtc(adev, drv_timings[mode]);
>
>   	cs5536_read(pdev, CAST,&cast);
> @@ -160,7 +172,9 @@ static void cs5536_set_dmamode(struct at
>   	u32 etc;
>   	int mode = adev->dma_mode;
>   	int dshift = adev->devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;
> -
> +#ifdef __IDE2LIBATA
> +	unsigned long timings = (unsigned long)ide_get_drivedata(adev);
> +#endif
>   	cs5536_read(pdev, ETC,&etc);
>
>   	if (mode>= XFER_UDMA_0) {
> @@ -168,7 +182,13 @@ static void cs5536_set_dmamode(struct at
>   		etc |= udma_timings[mode - XFER_UDMA_0]<<  dshift;
>   	} else { /* MWDMA */
>   		etc&= ~(IDE_ETC_UDMA_MASK<<  dshift);
> +#ifndef __IDE2LIBATA
>   		cs5536_program_dtc(adev, mwdma_timings[mode - XFER_MW_DMA_0]);
> +#else
> +		timings&= IDE_DRV_MASK;
> +		timings |= mwdma_timings[mode - XFER_MW_DMA_0]<<  8;
> +		ide_set_drivedata(adev, (void *)timings);
> +#endif
>   	}
>
>   	cs5536_write(pdev, ETC, etc);

Wow, that's really turning into a rat's nest of ifdefs, isn't it?

	Jeff



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/