diff mbox

[U-Boot] block: ahci: Remove dead code

Message ID 1446391107-18827-1-git-send-email-festevam@gmail.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Fabio Estevam Nov. 1, 2015, 3:18 p.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

CONFIG_AHCI_SETFEATURES_XFER is not selected by any user, so delete
the dead code.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/block/ahci.c | 36 ------------------------------------
 1 file changed, 36 deletions(-)

Comments

Bin Meng Nov. 1, 2015, 3:25 p.m. UTC | #1 
On Sun, Nov 1, 2015 at 11:18 PM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> CONFIG_AHCI_SETFEATURES_XFER is not selected by any user, so delete
> the dead code.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tom Rini Nov. 1, 2015, 3:26 p.m. UTC | #2 
On Sun, Nov 01, 2015 at 01:18:27PM -0200, Fabio Estevam wrote:

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> CONFIG_AHCI_SETFEATURES_XFER is not selected by any user, so delete
> the dead code.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

This used to be done unconditionally but was put under this flag as it
breaks some SSDs and doesn't seem to be needed otherwise.

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini Nov. 13, 2015, 1:30 a.m. UTC | #3 
On Sun, Nov 01, 2015 at 01:18:27PM -0200, Fabio Estevam wrote:

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> CONFIG_AHCI_SETFEATURES_XFER is not selected by any user, so delete
> the dead code.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c
index 82c6843..1ad638e 100644
--- a/drivers/block/ahci.c
+++ b/drivers/block/ahci.c
@@ -485,36 +485,6 @@  static void ahci_fill_cmd_slot(struct ahci_ioports *pp, u32 opts)
 #endif
 }
 
-
-#ifdef CONFIG_AHCI_SETFEATURES_XFER
-static void ahci_set_feature(u8 port)
-{
-	struct ahci_ioports *pp = &(probe_ent->port[port]);
-	void __iomem *port_mmio = pp->port_mmio;
-	u32 cmd_fis_len = 5;	/* five dwords */
-	u8 fis[20];
-
-	/* set feature */
-	memset(fis, 0, sizeof(fis));
-	fis[0] = 0x27;
-	fis[1] = 1 << 7;
-	fis[2] = ATA_CMD_SET_FEATURES;
-	fis[3] = SETFEATURES_XFER;
-	fis[12] = __ilog2(probe_ent->udma_mask + 1) + 0x40 - 0x01;
-
-	memcpy((unsigned char *)pp->cmd_tbl, fis, sizeof(fis));
-	ahci_fill_cmd_slot(pp, cmd_fis_len);
-	ahci_dcache_flush_sata_cmd(pp);
-	writel(1, port_mmio + PORT_CMD_ISSUE);
-	readl(port_mmio + PORT_CMD_ISSUE);
-
-	if (waiting_for_cmd_completed(port_mmio + PORT_CMD_ISSUE,
-				WAIT_MS_DATAIO, 0x1)) {
-		printf("set feature error on port %d!\n", port);
-	}
-}
-#endif
-
 static int wait_spinup(void __iomem *port_mmio)
 {
 	ulong start;
@@ -956,9 +926,6 @@  void scsi_low_level_init(int busdevfunc)
 				printf("Can not start port %d\n", i);
 				continue;
 			}
-#ifdef CONFIG_AHCI_SETFEATURES_XFER
-			ahci_set_feature((u8) i);
-#endif
 		}
 	}
 }
@@ -1002,9 +969,6 @@  int ahci_init(void __iomem *base)
 				printf("Can not start port %d\n", i);
 				continue;
 			}
-#ifdef CONFIG_AHCI_SETFEATURES_XFER
-			ahci_set_feature((u8) i);
-#endif
 		}
 	}
 err_out: