lkml.org 
[lkml]   [2009]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 10/12] ide: remove no longer needed IRQ fallback code from hwif_init()
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] ide: remove no longer needed IRQ fallback code from hwif_init()

    Then remove no longer used __ide_default_irq().

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-probe.c | 30 ++++--------------------------
    include/linux/ide.h | 15 ---------------
    2 files changed, 4 insertions(+), 41 deletions(-)

    Index: b/drivers/ide/ide-probe.c
    ===================================================================
    --- a/drivers/ide/ide-probe.c
    +++ b/drivers/ide/ide-probe.c
    @@ -1056,14 +1056,9 @@ static void drive_release_dev (struct de

    static int hwif_init(ide_hwif_t *hwif)
    {
    - int old_irq;
    -
    if (!hwif->irq) {
    - hwif->irq = __ide_default_irq(hwif->io_ports.data_addr);
    - if (!hwif->irq) {
    - printk(KERN_ERR "%s: disabled, no IRQ\n", hwif->name);
    - return 0;
    - }
    + printk(KERN_ERR "%s: disabled, no IRQ\n", hwif->name);
    + return 0;
    }

    if (register_blkdev(hwif->major, hwif->name))
    @@ -1081,29 +1076,12 @@ static int hwif_init(ide_hwif_t *hwif)

    sg_init_table(hwif->sg_table, hwif->sg_max_nents);

    - if (init_irq(hwif) == 0)
    - goto done;
    -
    - old_irq = hwif->irq;
    - /*
    - * It failed to initialise. Find the default IRQ for
    - * this port and try that.
    - */
    - hwif->irq = __ide_default_irq(hwif->io_ports.data_addr);
    - if (!hwif->irq) {
    - printk(KERN_ERR "%s: disabled, unable to get IRQ %d\n",
    - hwif->name, old_irq);
    - goto out;
    - }
    if (init_irq(hwif)) {
    - printk(KERN_ERR "%s: probed IRQ %d and default IRQ %d failed\n",
    - hwif->name, old_irq, hwif->irq);
    + printk(KERN_ERR "%s: disabled, unable to get IRQ %d\n",
    + hwif->name, hwif->irq);
    goto out;
    }
    - printk(KERN_WARNING "%s: probed IRQ %d failed, using default\n",
    - hwif->name, hwif->irq);

    -done:
    blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
    THIS_MODULE, ata_probe, ata_lock, hwif);
    return 1;
    Index: b/include/linux/ide.h
    ===================================================================
    --- a/include/linux/ide.h
    +++ b/include/linux/ide.h
    @@ -193,21 +193,6 @@ static inline void ide_std_init_ports(hw
    hw->io_ports.ctl_addr = ctl_addr;
    }

    -/* for IDE PCI controllers in legacy mode, temporary */
    -static inline int __ide_default_irq(unsigned long base)
    -{
    - switch (base) {
    -#ifdef CONFIG_IA64
    - case 0x1f0: return isa_irq_to_vector(14);
    - case 0x170: return isa_irq_to_vector(15);
    -#else
    - case 0x1f0: return 14;
    - case 0x170: return 15;
    -#endif
    - }
    - return 0;
    -}
    -
    #if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \
    defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
    || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)

    \
     
     \ /
      Last update: 2009-01-19 15:21    [W:0.024 / U:0.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site