palm_bk3710: factor out cable detection
PATCH 3/3 palm_bk3710: factor out cable detection
Factor out cable detection to palm_bk3710_cable_detect().
--- drivers/ide/arm/palm_bk3710.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/ide/arm/palm_bk3710.c +7 -1
@@ -311,6 +311,12 @@ static void __devinit palm_bk3710_chipinpalm_bk3710_setpiomode (base,NULL ,0 ,600 ,0 );palm_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); } + +static u8 __devinit palm_bk3710_cable_detect (ide_hwif_t *hwif) +{ +return ATA_CBL_PATA80 ; +} +static int __devinit palm_bk3710_probe (struct platform_device *pdev) {struct clk *clkp;
@@ -381,7 +387,7 @@ static int __devinit palm_bk3710_probe(s hwif->set_dma_mode = &palm_bk3710_set_dma_mode; hwif->mmio =1 ;default_hwif_mmiops (hwif); - hwif->cbl =ATA_CBL_PATA80 ; + hwif->cbl =palm_bk3710_cable_detect (hwif); hwif->ultra_mask =0x1f ;/* Ultra DMA Mode 4 Max (input clk 99MHz) */ hwif->mwdma_mask =0x7 ;
Quoted 23 lines · Bartlomiej Zolnierkiewicz
Factor out cable detection to
palm_bk3710_cable_detect().Cc Anton Salnikov <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Index:
b/drivers/ide/arm/palm_bk3710.c
===================================================================drivers/ide/arm/palm_bk3710.c +6
-0@@ -311,6 +311,12 @@ static void __devinit palm_bk3710_chipinpalm_bk3710_setpiomode (base,NULL ,0 ,600 ,0 );palm_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); } + +static u8 __devinit palm_bk3710_cable_detect (ide_hwif_t *hwif) +{ +return ATA_CBL_PATA80 ; +} +static int __devinit palm_bk3710_probe (struct platform_device *pdev) {struct clk *clkp;
drivers/ide/arm/palm_bk3710.c static int __devinit palm_bk3710_probe(s · line 393
Quoted 8 lines
drivers/ide/arm/palm_bk3710.c +1
-1@@ -381,7 +387,7 @@ static int __devinit palm_bk3710_probe(s hwif->set_dma_mode = &palm_bk3710_set_dma_mode; hwif->mmio =1 ;default_hwif_mmiops (hwif); - hwif->cbl =ATA_CBL_PATA80 ; + hwif->cbl =palm_bk3710_cable_detect (hwif); hwif->ultra_mask =0x1f ;/* Ultra DMA Mode 4 Max (input clk 99MHz) */ hwif->mwdma_mask =0x7 ;
Hm, how does it help if you don't make it into driver's method? :-O
MBR, Sergei
Quoted 27 lines · Sergei Shtylyov
Quoted 25 lines · Bartlomiej Zolnierkiewicz
Factor out cable detection to
palm_bk3710_cable_detect().Cc Anton Salnikov <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Index:
b/drivers/ide/arm/palm_bk3710.c
===================================================================drivers/ide/arm/palm_bk3710.c +6
-0@@ -311,6 +311,12 @@ static void __devinit palm_bk3710_chipinpalm_bk3710_setpiomode (base,NULL ,0 ,600 ,0 );palm_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); } + +static u8 __devinit palm_bk3710_cable_detect (ide_hwif_t *hwif) +{ +return ATA_CBL_PATA80 ; +} +static int __devinit palm_bk3710_probe (struct platform_device *pdev) {struct clk *clkp;@@ -381,7 +387,7 @@ static int __devinit palm_bk3710_probe(s hwif->set_dma_mode = &palm_bk3710_set_dma_mode; hwif->mmio =1 ;
Quoted 8 lines
drivers/ide/arm/palm_bk3710.c static int __devinit palm_bk3710_probe(s · line 393
Quoted 6 lines
drivers/ide/arm/palm_bk3710.c +1
-1default_hwif_mmiops (hwif); - hwif->cbl =ATA_CBL_PATA80 ; + hwif->cbl =palm_bk3710_cable_detect (hwif); hwif->ultra_mask =0x1f ;/* Ultra DMA Mode 4 Max (input clk 99MHz) */ hwif->mwdma_mask =0x7 ;Hm, how does it help if you don't make it into driver's method? :-O
This was meant to be a preparation before converting palm_bk3710 to use struct ide_port_info. On the second thought this change may be as well integrated into the future patch (which I'll try to cook later today, unless somebody beats me to it ;-).
Thanks,
Bart
Quoted 37 lines · Bartlomiej Zolnierkiewicz
Quoted 27 lines · Sergei Shtylyov
Quoted 25 lines · Bartlomiej Zolnierkiewicz
Factor out cable detection to
palm_bk3710_cable_detect().Cc Anton Salnikov <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Index:
b/drivers/ide/arm/palm_bk3710.c
===================================================================drivers/ide/arm/palm_bk3710.c +6
-0@@ -311,6 +311,12 @@ static void __devinit palm_bk3710_chipinpalm_bk3710_setpiomode (base,NULL ,0 ,600 ,0 );palm_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); } + +static u8 __devinit palm_bk3710_cable_detect (ide_hwif_t *hwif) +{ +return ATA_CBL_PATA80 ; +} +static int __devinit palm_bk3710_probe (struct platform_device *pdev) {struct clk *clkp;@@ -381,7 +387,7 @@ static int __devinit palm_bk3710_probe(s hwif->set_dma_mode = &palm_bk3710_set_dma_mode; hwif->mmio =1 ;Quoted 8 lines
drivers/ide/arm/palm_bk3710.c static int __devinit palm_bk3710_probe(s · line 393
Quoted 6 lines
drivers/ide/arm/palm_bk3710.c +1
-1default_hwif_mmiops (hwif); - hwif->cbl =ATA_CBL_PATA80 ; + hwif->cbl =palm_bk3710_cable_detect (hwif); hwif->ultra_mask =0x1f ;/* Ultra DMA Mode 4 Max (input clk 99MHz) */ hwif->mwdma_mask =0x7 ;Hm, how does it help if you don't make it into driver's method? :-O
Quoted 4 lines
This was meant to be a preparation before converting
palm_bk3710to use structide_port_info. On the second thought this change may be as well integrated into the future patch (which I'll try to cook later today, unless somebody beats me to it ;-).
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] palm_bk3710: use struct ide_port_info
* Factor out cable detection to palm_bk3710_cable_detect().
* Add palm_bk3710_init_hwif() (->init_hwif method implementation).
* Remove needless ->quirkproc initialization.
* Add missing ->pio_mask initialization.
* Use ATA_* defines for setting ->{ultra,mwdma}_mask.
* Add 'struct ide_port_info palm_bk3710_port_info' and pass it to ide_device_add(). Then remove open-coded 'hwif' initialization.
--- drivers/ide/arm/palm_bk3710.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/ide/arm/palm_bk3710.c +23 -10
@@ -311,6 +311,28 @@ static void __devinit palm_bk3710_chipinpalm_bk3710_setpiomode (base,NULL ,0 ,600 ,0 );palm_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); } + +static u8 __devinit palm_bk3710_cable_detect (ide_hwif_t *hwif) +{ +return ATA_CBL_PATA80 ; +} + +static void __devinit palm_bk3710_init_hwif (ide_hwif_t *hwif) +{ + hwif->set_pio_mode = palm_bk3710_set_pio_mode; + hwif->set_dma_mode = palm_bk3710_set_dma_mode; + + hwif->cable_detect = palm_bk3710_cable_detect; +} + +static const struct ide_port_info __devinitdata palm_bk3710_port_info = { + .init_hwif = palm_bk3710_init_hwif, + .host_flags =IDE_HFLAG_NO_DMA ,/* hack (no PCI) */ + .pio_mask =ATA_PIO4 , + .udma_mask =ATA_UDMA4 ,/* (input clk 99MHz) */ + .mwdma_mask =ATA_MWDMA2 , +}; +static int __devinit palm_bk3710_probe (struct platform_device *pdev) {struct clk *clkp;
@@ -368,24 +390,15 @@ static int __devinit palm_bk3710_probe(side_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw); - hwif->quirkproc =NULL ; - hwif->set_pio_mode = &palm_bk3710_set_pio_mode; - hwif->set_dma_mode = &palm_bk3710_set_dma_mode; hwif->mmio =1 ;default_hwif_mmiops (hwif); - hwif->cbl =ATA_CBL_PATA80 ; - hwif->ultra_mask =0x1f ;/* Ultra DMA Mode 4 Max -(input clk 99MHz) */ - hwif->mwdma_mask =0x7 ; - hwif->drives[0 ].autotune =1 ; - hwif->drives[1 ].autotune =1 ;ide_setup_dma (hwif, mem->start); idx[0 ] = i; -ide_device_add (idx,NULL ); +ide_device_add (idx, &palm_bk3710_port_info);if (!hwif->present) goto out;
Sergei Shtylyov
Acked-byQuoted 11 lines · Bartlomiej Zolnierkiewicz
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH]palm_bk3710: use structide_port_info* Factor out cable detection to
palm_bk3710_cable_detect().* Add
palm_bk3710_init_hwif()(->init_hwif method implementation).* Remove needless ->quirkproc initialization.
* Add missing ->pio_mask initialization.
Quoted 8 lines
* Use ATA_* defines for setting ->{ultra,mwdma}_mask.
* Add 'struct
ide_port_infopalm_bk3710_port_info' and pass it toide_device_add(). Then remove open-coded 'hwif' initialization.Cc Anton Salnikov <[email protected]>Cc Sergei Shtylyov <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
MBR, Sergei