lkml.org 
[lkml]   [2009]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 40/86] pata_it8213: fix register naming used in it8213_set_piomode()
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] pata_it8213: fix register naming used in it8213_set_piomode()

    Rename 'idetm_port' and 'idetm_data' variables to 'master_port'
    and 'master_data' respectively to match register naming used in
    it8213_set_dma_mode() and in ata_piix.c.

    Fix 'master_port' type while at it.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ata/pata_it8213.c | 20 ++++++++++----------
    1 file changed, 10 insertions(+), 10 deletions(-)

    Index: b/drivers/ata/pata_it8213.c
    ===================================================================
    --- a/drivers/ata/pata_it8213.c
    +++ b/drivers/ata/pata_it8213.c
    @@ -76,8 +76,8 @@ static void it8213_set_piomode (struct a
    {
    unsigned int pio = adev->pio_mode - XFER_PIO_0;
    struct pci_dev *dev = to_pci_dev(ap->host->dev);
    - unsigned int idetm_port= ap->port_no ? 0x42 : 0x40;
    - u16 idetm_data;
    + u8 master_port = ap->port_no ? 0x42 : 0x40;
    + u16 master_data;
    int control = 0;

    /*
    @@ -100,19 +100,19 @@ static void it8213_set_piomode (struct a
    if (adev->class != ATA_DEV_ATA)
    control |= 4; /* PPE */

    - pci_read_config_word(dev, idetm_port, &idetm_data);
    + pci_read_config_word(dev, master_port, &master_data);

    /* Set PPE, IE, and TIME as appropriate */
    if (adev->devno == 0) {
    - idetm_data &= 0xCCF0;
    - idetm_data |= control;
    - idetm_data |= (timings[pio][0] << 12) |
    + master_data &= 0xCCF0;
    + master_data |= control;
    + master_data |= (timings[pio][0] << 12) |
    (timings[pio][1] << 8);
    } else {
    u8 slave_data;

    - idetm_data &= 0xFF0F;
    - idetm_data |= (control << 4);
    + master_data &= 0xFF0F;
    + master_data |= (control << 4);

    /* Slave timing in separate register */
    pci_read_config_byte(dev, 0x44, &slave_data);
    @@ -121,8 +121,8 @@ static void it8213_set_piomode (struct a
    pci_write_config_byte(dev, 0x44, slave_data);
    }

    - idetm_data |= 0x4000; /* Ensure SITRE is set */
    - pci_write_config_word(dev, idetm_port, idetm_data);
    + master_data |= 0x4000; /* Ensure SITRE is set */
    + pci_write_config_word(dev, master_port, master_data);
    }

    /**

    \
     
     \ /
      Last update: 2009-11-25 18:55    [W:3.685 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site