From 5883212f19d73b2123c3c42dcbf173eb7aaad0e3 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Mon, 8 May 2017 14:43:39 -0700 Subject: [PATCH] UPSTREAM: drivers/storage: Remove set_control_reg Remove unused field in generic SD/MMC controller data structure. TEST=Build and run on Galileo Gen2 Change-Id: Icc3b0a6856e6454a2db45cf44cf01e3c2dada95e Signed-off-by: Patrick Georgi Original-Commit-Id: 1c1c071b88c52ec8c580328062df28a6a091b7a0 Original-Change-Id: I7169dca07509a6f2513d62b593742daf764010b2 Original-Signed-off-by: Lee Leahy Original-Reviewed-on: https://review.coreboot.org/19629 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Patrick Georgi Original-Reviewed-by: Paul Menzel Reviewed-on: https://chromium-review.googlesource.com/506169 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/drivers/storage/sdhci.c | 3 --- src/include/device/sd_mmc_ctrlr.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/drivers/storage/sdhci.c b/src/drivers/storage/sdhci.c index f05a47ef6e..c17aa27b9f 100644 --- a/src/drivers/storage/sdhci.c +++ b/src/drivers/storage/sdhci.c @@ -550,9 +550,6 @@ static void sdhci_set_ios(struct sd_mmc_ctrlr *ctrlr) u32 bus_width; int version; - if (ctrlr->set_control_reg) - ctrlr->set_control_reg(ctrlr); - /* Set the clock frequency */ if (ctrlr->bus_hz != ctrlr->request_hz) sdhci_set_clock(sdhci_ctrlr, ctrlr->request_hz); diff --git a/src/include/device/sd_mmc_ctrlr.h b/src/include/device/sd_mmc_ctrlr.h index c3b4f60d08..b7541da12f 100644 --- a/src/include/device/sd_mmc_ctrlr.h +++ b/src/include/device/sd_mmc_ctrlr.h @@ -127,7 +127,6 @@ struct sd_mmc_ctrlr { int (*send_cmd)(struct sd_mmc_ctrlr *ctrlr, struct mmc_command *cmd, struct mmc_data *data); void (*set_ios)(struct sd_mmc_ctrlr *ctrlr); - void (*set_control_reg)(struct sd_mmc_ctrlr *ctrlr); void (*tuning_start)(struct sd_mmc_ctrlr *ctrlr, int retune); int (*is_tuning_complete)(struct sd_mmc_ctrlr *ctrlr, int *successful);