On Tuesday 14 October 2008, Sergei Shtylyov wrote:
> Hello.
>
> Bartlomiej Zolnierkiewicz wrote:
>
> > * Factor out disabling of "fast interrupt" prediction from
> > init_hwif_hpt366() to hpt3xx_disable_fast_irq() helper.
>
> > * Use hpt3xx_disable_fast_irq() in ->init_chipset instead of
> > ->init_hwif method.
>
> > This is a preparation for adding proper PCI PM support.
>
> > While at it:
>
> > * Cache chip type in chip_type variable in hpt3xx_disable_fast_irq().
>
> > There should be no functional changes caused by this patch.
>
> Except a warning. ;-)
Sorry for that but... shit happens. ;)
> > Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
>
> > Index: b/drivers/ide/pci/hpt366.c
> > ===================================================================
> > --- a/drivers/ide/pci/hpt366.c
> > +++ b/drivers/ide/pci/hpt366.c
> > @@ -1265,7 +1297,6 @@ static void __devinit init_hwif_hpt366(i
> > struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
> > int serialize = HPT_SERIALIZE_IO;
> > u8 chip_type = info->chip_type;
> > - u8 new_mcr, old_mcr = 0;
> >
> > /* Cache the channel's MISC. control registers' offset */
> > hwif->select_data = hwif->channel ? 0x54 : 0x50;
> > @@ -1288,29 +1319,6 @@ static void __devinit init_hwif_hpt366(i
> > /* Serialize access to this device if needed */
> > if (serialize && hwif->mate)
> > hwif->serialized = hwif->mate->serialized = 1;
> > -
> > - /*
> > - * Disable the "fast interrupt" prediction. Don't hold off
> > - * on interrupts. (== 0x01 despite what the docs say)
> > - */
> > - pci_read_config_byte(dev, hwif->select_data + 1, &old_mcr);
> > -
> > - if (info->chip_type >= HPT374)
> > - new_mcr = old_mcr & ~0x07;
> > - else if (info->chip_type >= HPT370) {
> > - new_mcr = old_mcr;
> > - new_mcr &= ~0x02;
> > -
> > -#ifdef HPT_DELAY_INTERRUPT
> > - new_mcr &= ~0x01;
> > -#else
> > - new_mcr |= 0x01;
> > -#endif
> > - } else /* HPT366 and HPT368 */
> > - new_mcr = old_mcr & ~0x80;
> > -
> > - if (new_mcr != old_mcr)
> > - pci_write_config_byte(dev, hwif->select_data + 1, new_mcr);
> > }
>
> CC drivers/ide/pci/hpt366.o
> drivers/ide/pci/hpt366.c: In function `init_hwif_hpt366':
> drivers/ide/pci/hpt366.c:1290: warning: unused variable `dev'
>
> You've removed the users of that variable but left the variable itself...
> alas, it's too late to fix the patch. :-/
Not such a big deal, we just have to make an another one...
From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Subject: [PATCH] hpt366: fix compile warning
Fixup for commit 1785192b5310ee25165768f5bb80f13146788e3e
("hpt366: add hpt3xx_disable_fast_irq() helper"):
CC drivers/ide/pci/hpt366.o
drivers/ide/pci/hpt366.c: In function `init_hwif_hpt366':
drivers/ide/pci/hpt366.c:1290: warning: unused variable `dev'
Reported-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
drivers/ide/pci/hpt366.c | 1 -
1 file changed, 1 deletion(-)
Index: b/drivers/ide/pci/hpt366.c
===================================================================
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1289,7 +1289,6 @@ static u8 hpt3xx_cable_detect(ide_hwif_t
static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
{
- struct pci_dev *dev = to_pci_dev(hwif->dev);
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
int serialize = HPT_SERIALIZE_IO;
u8 chip_type = info->chip_type;
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
