scc_pata: add ->{in,out}put_data methods
PATCH 2/6 scc_pata: add ->{in,out}put_data methods
There should be no functional changes caused by this patch.
--- drivers/ide/pci/scc_pata.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/ide/pci/scc_pata.c +33 -0
@@ -574,6 +574,36 @@ static int __devinit init_setup_scc(strureturn ide_setup_pci_device (dev, d); } +static void scc_input_data (ide_drive_t *drive,void *buf,unsigned int len) +{ +unsigned long data_addr = drive->hwif->io_ports.data_addr; + + len++; + +if (drive->io_32bit) { +scc_ide_insl (data_addr, buf, len /4 ); + +if ((len &3 ) >=2 ) +scc_ide_insw (data_addr, (u8 *)buf + (len & ~3 ),1 ); + }else +scc_ide_insw (data_addr, buf, len /2 ); +} + +static void scc_output_data (ide_drive_t *drive,void *buf,unsigned int len) +{ +unsigned long data_addr = drive->hwif->io_ports.data_addr; + + len++; + +if (drive->io_32bit) { +scc_ide_outsl (data_addr, buf, len /4 ); + +if ((len &3 ) >=2 ) +scc_ide_outsw (data_addr, (u8 *)buf + (len & ~3 ),1 ); + }else +scc_ide_outsw (data_addr, buf, len /2 ); +} +/** * init_mmio_iops_scc - set up the iops for MMIO * @hwif: interface to set up
@@ -589,6 +619,9 @@ static void __devinit init_mmio_iops_sccide_set_hwifdata (hwif, ports); + hwif->input_data = scc_input_data; + hwif->output_data = scc_output_data; + hwif->INB = scc_ide_inb; hwif->INW = scc_ide_inw; hwif->INSW = scc_ide_insw;
drivers/ide/pci/scc_pata.c static int __devinit init_setup_scc(stru · line 575
Quoted 11 lines · Bartlomiej Zolnierkiewicz
There should be no functional changes caused by this patch.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Index:
b/drivers/ide/pci/scc_pata.c
===================================================================drivers/ide/pci/scc_pata.c +0
-0@@ -574,6 +574,36 @@ static int __devinit init_setup_scc(strureturn ide_setup_pci_device (dev, d); }
This patch in the pata-2.6 series doesn't apply anymore after the patch
getting rid of ide_setup_pci_device() call was merged.
WBR, Sergei
Quoted 6 lines · Sergei Shtylyov
Quoted 3 lines · Bartlomiej Zolnierkiewicz
There should be no functional changes caused by this patch.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Quoted 10 lines
drivers/ide/pci/scc_pata.c static int __devinit init_setup_scc(stru · line 575
Quoted 7 lines
Index:
b/drivers/ide/pci/scc_pata.c
===================================================================drivers/ide/pci/scc_pata.c +0
-0@@ -574,6 +574,36 @@ static int __devinit init_setup_scc(strureturn ide_setup_pci_device (dev, d); }This patch in the pata-2.6 series doesn't apply anymore after the patch
getting rid ofide_setup_pci_device()call was merged.
I updated it in IDE tree while merging Akira's patch but it turned out that "take 2" was needed anyway...