Re: [PATCH 3/3] [libata/BF54x]: Fix compling failure bug - change variable's name according to API update

Jeff Garzik
2008-04-25T05:20:45Z

Bryan Wu wrote:
> From: Sonic Zhang <sonic.zhang@analog.com>
>
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> ---
> drivers/ata/pata_bf54x.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
> index 4142894..94b818e 100644
> --- a/drivers/ata/pata_bf54x.c
> +++ b/drivers/ata/pata_bf54x.c
> @@ -1342,7 +1342,7 @@ static int bfin_port_start(struct ata_port *ap)
> inline unsigned int bfin_ata_host_intr(struct ata_port *ap,
> struct ata_queued_cmd *qc)
> {
> - struct ata_eh_info *ehi = &ap->eh_info;
> + struct ata_eh_info *ehi = &ap->link.eh_info;
> u8 status, host_stat = 0;
>
> VPRINTK("ata%u: protocol %d task_state %d\n",
> @@ -1443,11 +1443,10 @@ irqreturn_t bfin_ata_interrupt(int irq, void *dev_instance)
> !(ap->flags & ATA_FLAG_DISABLED)) {
> struct ata_queued_cmd *qc;
>
> - qc = ata_qc_from_tag(ap, ap->active_tag);
> + qc = ata_qc_from_tag(ap, ap->link.active_tag);
> if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)) &&
> (qc->flags & ATA_QCFLAG_ACTIVE))
> handled |= bfin_ata_host_intr(ap, qc);

you need to combine this patch with the first patch, to form a single
logical whole.

Build fixes should always be folded into the patch that introduces that
problem (unless the patch is already upstream, of course). Otherwise,
you potentially introduce git-bisect breakage.

Jeff