lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [PATCH 3/3] pata_cmd64x: remove dead CMD646 rev 1 code
    Date
    Alan Cox wrote:

    > On Tue, 11 Oct 2011 19:59:03 +0200
    > Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
    >
    > > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    > > Subject: [PATCH] pata_cmd64x: remove dead CMD646 rev 1 code
    > >
    > > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    >
    > You forgot to document why it is dead and why it should be removed

    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH v2] pata_cmd64x: remove dead CMD646 rev 1 code

    cmd646r1_bmdma_stop() just calls the standard ata_bmdma_stop()
    helper and it has been the case since the driver introduction
    by commit 669a5db ("[libata] Add a bunch of PATA drivers.") in
    Aug 2006.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    v2: updated patch description

    drivers/ata/pata_cmd64x.c | 33 ++-------------------------------
    1 file changed, 2 insertions(+), 31 deletions(-)

    Index: b/drivers/ata/pata_cmd64x.c
    ===================================================================
    --- a/drivers/ata/pata_cmd64x.c
    +++ b/drivers/ata/pata_cmd64x.c
    @@ -249,18 +249,6 @@ static void cmd648_bmdma_stop(struct ata
    pci_write_config_byte(pdev, dma_reg, dma_intr | dma_mask);
    }

    -/**
    - * cmd646r1_dma_stop - DMA stop callback
    - * @qc: Command in progress
    - *
    - * Stub for now while investigating the r1 quirk in the old driver.
    - */
    -
    -static void cmd646r1_bmdma_stop(struct ata_queued_cmd *qc)
    -{
    - ata_bmdma_stop(qc);
    -}
    -
    static struct scsi_host_template cmd64x_sht = {
    ATA_BMDMA_SHT(DRV_NAME),
    };
    @@ -276,12 +264,6 @@ static struct ata_port_operations cmd64x
    .cable_detect = ata_cable_40wire,
    };

    -static struct ata_port_operations cmd646r1_port_ops = {
    - .inherits = &cmd64x_base_ops,
    - .bmdma_stop = cmd646r1_bmdma_stop,
    - .cable_detect = ata_cable_40wire,
    -};
    -
    static struct ata_port_operations cmd648_port_ops = {
    .inherits = &cmd64x_base_ops,
    .bmdma_stop = cmd648_bmdma_stop,
    @@ -326,12 +308,6 @@ static int cmd64x_init_one(struct pci_de
    .udma_mask = ATA_UDMA2,
    .port_ops = &cmd64x_port_ops
    },
    - { /* CMD 646 rev 1 */
    - .flags = ATA_FLAG_SLAVE_POSS,
    - .pio_mask = ATA_PIO4,
    - .mwdma_mask = ATA_MWDMA2,
    - .port_ops = &cmd646r1_port_ops
    - },
    { /* CMD 648 */
    .flags = ATA_FLAG_SLAVE_POSS,
    .pio_mask = ATA_PIO4,
    @@ -374,11 +350,6 @@ static int cmd64x_init_one(struct pci_de
    ppi[0] = &cmd_info[2];
    ppi[1] = &cmd_info[2];
    }
    - /* Early rev with other problems ? */
    - else if (pdev->revision == 1) {
    - ppi[0] = &cmd_info[3];
    - ppi[1] = &cmd_info[3];
    - }
    /* revs 1,2 have no CNTRL_CH0 */
    if (pdev->revision < 3)
    cntrl_ch0_ok = 0;
    @@ -423,8 +394,8 @@ static int cmd64x_reinit_one(struct pci_
    static const struct pci_device_id cmd64x[] = {
    { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 },
    { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_646), 1 },
    - { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_648), 4 },
    - { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_649), 5 },
    + { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_648), 3 },
    + { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_649), 4 },

    { },
    };

    \
     
     \ /
      Last update: 2011-10-12 17:31    [W:0.054 / U:0.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site