lkml.org 
[lkml]   [2006]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC PATCH] move aic7xxx to pci_request_irq
    Hi,

    This proof-of-concept patch converts the aic7xxx drivers to use the
    pci_request_irq() function.

    Regards,
    Frederik


    diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
    index 2001fe8..c934f30 100644
    --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
    +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
    @@ -341,12 +341,12 @@ ahd_pci_map_int(struct ahd_softc *ahd)
    {
    int error;

    - error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
    - IRQF_SHARED, "aic79xx", ahd);
    + error = pci_request_irq(ahd->dev_softc, ahd_linux_isr,
    + IRQF_SHARED, "aic79xx");
    if (!error)
    ahd->platform_data->irq = ahd->dev_softc->irq;

    - return (-error);
    + return error;
    }

    void
    diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
    index ea5687d..d5c402e 100644
    --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
    +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
    @@ -368,16 +368,14 @@ ahc_pci_map_registers(struct ahc_softc *
    return (error);
    }

    -int
    -ahc_pci_map_int(struct ahc_softc *ahc)
    +int ahc_pci_map_int(struct ahc_softc *ahc)
    {
    int error;

    - error = request_irq(ahc->dev_softc->irq, ahc_linux_isr,
    - IRQF_SHARED, "aic7xxx", ahc);
    + error = pci_request_irq(ahc->dev_softc, ahc_linux_isr, IRQF_SHARED,
    + "aic7xxx");
    if (error == 0)
    ahc->platform_data->irq = ahc->dev_softc->irq;
    -
    - return (-error);
    -}

    + return error;
    +}
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-10-02 20:11    [W:0.055 / U:0.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site