Skip to contentSkip to conversation

icside: use struct ide_port_info also for PCB version 5

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 4 messages Jan 24, 2009 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 icside: use struct ide_port_info also for PCB version 5

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: use struct ide_port_info also for PCB version 5

This fixes hwif->channel and drive->dn assignments.

---
 drivers/ide/icside.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/ide/icside.c +6 -2
Index: b/drivers/ide/icside.c
===================================================================
@@ -419,6 +419,10 @@ static void icside_setup_ports(hw_regs_t
 	hw->chipset = ide_acorn;
 }
 
+static const struct ide_port_info icside_v5_port_info = {
+	.host_flags		= IDE_HFLAG_NO_DMA,
+};
+
 static int __devinit
 icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
@@ -445,7 +449,7 @@ icside_register_v5(struct icside_state *
 
 	icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
 
-	host = ide_host_alloc(NULL, hws);
+	host = ide_host_alloc(&icside_v5_port_info, hws);
 	if (host == NULL)
 		return -ENODEV;
 
@@ -534,7 +538,7 @@ icside_register_v6(struct icside_state *
 		d.dma_ops = NULL;
 	}
 
-	ret = ide_host_register(host, NULL, hws);
+	ret = ide_host_register(host, &icside_v5_port_info, hws);
 	if (ret)
 		goto err_free;
 
#1 lore raw
Quoted 4 lines · Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: use struct ide_port_info also for PCB version 5

This fixes hwif->channel and drive->dn assignments.

I really don't care about this driver anymore - people should be using the PATA version instead.

Nevertheless, this patch looks broken.

Review icside_register_v6(struct icside_state *

Quoted 1 line
(quoted diff) +0 -0
@@ -534,7 +538,7 @@ icside_register_v6(struct icside_state *
                      ^^^^^^^^^^^^^^^^^^ v6 function

drivers/ide/icside.c icside_register_v6(struct icside_state * · line 541

Quoted 5 lines
drivers/ide/icside.c +1 -1
 		d.dma_ops = NULL;
 	}
 
-	ret = ide_host_register(host, NULL, hws);
+	ret = ide_host_register(host, &icside_v5_port_info, hws);
                                      ^^^^^^^^^^^^^^^^^^^^^ v5 info
Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#2 lore raw
Quoted 8 lines · Russell King
Quoted 4 lines · Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: use struct ide_port_info also for PCB version 5

This fixes hwif->channel and drive->dn assignments.

I really don't care about this driver anymore - people should be using the PATA version instead.

I really don't see major technical arguments for using libata version (especially after 2.6.29 IDE changes) but it's your call so if you want icside removed just send me a patch and I'll apply it (given that there are no complaints from users).

[ No strong feelings here as it will allow me to better use my time
and concentrate on working on code that people care about. ]

Quoted 11 lines

Nevertheless, this patch looks broken.

Review icside_register_v6(struct icside_state *

Quoted 1 line
(quoted diff) +0 -0
@@ -534,7 +538,7 @@ icside_register_v6(struct icside_state *
                      ^^^^^^^^^^^^^^^^^^ v6 function

drivers/ide/icside.c icside_register_v6(struct icside_state * · line 541

Quoted 5 lines
drivers/ide/icside.c +1 -1
 		d.dma_ops = NULL;
 	}
 
-	ret = ide_host_register(host, NULL, hws);
+	ret = ide_host_register(host, &icside_v5_port_info, hws);
                                      ^^^^^^^^^^^^^^^^^^^^^ v5 info

Grrr.. and the other icside patch has v5->v6 mismatch.

Thanks for noticing. I'll post corrected patches in few minutes.

#3 lore raw
In reply to Bartlomiej Zolnierkiewicz
Quoted 7 lines · Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: use struct ide_port_info also for PCB version 5

This fixes hwif->channel and drive->dn assignments.

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: use struct ide_port_info also for PCB version 5 (v2)

This fixes hwif->channel and drive->dn assignments.

v2:
Fix v5/v6 mismatch noticed by Russell.

---
 drivers/ide/icside.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/ide/icside.c +6 -2
Index: b/drivers/ide/icside.c
===================================================================
@@ -419,6 +419,10 @@ static void icside_setup_ports(hw_regs_t
 	hw->chipset = ide_acorn;
 }
 
+static const struct ide_port_info icside_v5_port_info = {
+	.host_flags		= IDE_HFLAG_NO_DMA,
+};
+
 static int __devinit
 icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
@@ -445,7 +449,7 @@ icside_register_v5(struct icside_state *
 
 	icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
 
-	host = ide_host_alloc(NULL, hws);
+	host = ide_host_alloc(&icside_v5_port_info, hws);
 	if (host == NULL)
 		return -ENODEV;
 
@@ -453,7 +457,7 @@ icside_register_v5(struct icside_state *
 
 	ecard_set_drvdata(ec, state);
 
-	ret = ide_host_register(host, NULL, hws);
+	ret = ide_host_register(host, &icside_v5_port_info, hws);
 	if (ret)
 		goto err_free;