Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c62e675 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Remove ->select_drive_strength() callback 



Drivers can use the host operation directly, so remove this now unused
callback.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
parent 51ced59c

drivers/mmc/host/sdhci-pci-core.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -36,10 +36,6 @@ 
static int sdhci_pci_enable_dma(struct sdhci_host *host);

static int sdhci_pci_enable_dma(struct sdhci_host *host);

static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width);

static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width);

static void sdhci_pci_hw_reset(struct sdhci_host *host);

static void sdhci_pci_hw_reset(struct sdhci_host *host);

static int sdhci_pci_select_drive_strength(struct sdhci_host *host,

					   struct mmc_card *card,

					   unsigned int max_dtr, int host_drv,

					   int card_drv, int *drv_type);





/*****************************************************************************\

/*****************************************************************************\

 *                                                                           *

 *                                                                           *
@@ -514,7 +510,6 @@ static const struct sdhci_ops sdhci_intel_byt_ops = { 
	.reset			= sdhci_reset,

	.reset			= sdhci_reset,

	.set_uhs_signaling	= sdhci_set_uhs_signaling,

	.set_uhs_signaling	= sdhci_set_uhs_signaling,

	.hw_reset		= sdhci_pci_hw_reset,

	.hw_reset		= sdhci_pci_hw_reset,

	.select_drive_strength	= sdhci_pci_select_drive_strength,

};

};





static const struct sdhci_pci_fixes sdhci_intel_byt_emmc = {

static const struct sdhci_pci_fixes sdhci_intel_byt_emmc = {
@@ -1658,20 +1653,6 @@ static void sdhci_pci_hw_reset(struct sdhci_host *host) 
		slot->hw_reset(host);

		slot->hw_reset(host);

}

}





static int sdhci_pci_select_drive_strength(struct sdhci_host *host,

					   struct mmc_card *card,

					   unsigned int max_dtr, int host_drv,

					   int card_drv, int *drv_type)

{

	struct sdhci_pci_slot *slot = sdhci_priv(host);



	if (!slot->select_drive_strength)

		return 0;



	return slot->select_drive_strength(host, card, max_dtr, host_drv,

					   card_drv, drv_type);

}



static const struct sdhci_ops sdhci_pci_ops = {

static const struct sdhci_ops sdhci_pci_ops = {

	.set_clock	= sdhci_set_clock,

	.set_clock	= sdhci_set_clock,

	.enable_dma	= sdhci_pci_enable_dma,

	.enable_dma	= sdhci_pci_enable_dma,
@@ -1679,7 +1660,6 @@ static const struct sdhci_ops sdhci_pci_ops = { 
	.reset		= sdhci_reset,

	.reset		= sdhci_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.hw_reset		= sdhci_pci_hw_reset,

	.hw_reset		= sdhci_pci_hw_reset,

	.select_drive_strength	= sdhci_pci_select_drive_strength,

};

};





/*****************************************************************************\

/*****************************************************************************\

drivers/mmc/host/sdhci-pci.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -86,10 +86,6 @@ struct sdhci_pci_slot { 
	bool			cd_override_level;

	bool			cd_override_level;





	void (*hw_reset)(struct sdhci_host *host);

	void (*hw_reset)(struct sdhci_host *host);

	int (*select_drive_strength)(struct sdhci_host *host,

				     struct mmc_card *card,

				     unsigned int max_dtr, int host_drv,

				     int card_drv, int *drv_type);

	unsigned long		private[0] ____cacheline_aligned;

	unsigned long		private[0] ____cacheline_aligned;

};

};

drivers/mmc/host/sdhci.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -2182,19 +2182,6 @@ int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 
}

}

EXPORT_SYMBOL_GPL(sdhci_execute_tuning);

EXPORT_SYMBOL_GPL(sdhci_execute_tuning);





static int sdhci_select_drive_strength(struct mmc_card *card,

				       unsigned int max_dtr, int host_drv,

				       int card_drv, int *drv_type)

{

	struct sdhci_host *host = mmc_priv(card->host);



	if (!host->ops->select_drive_strength)

		return 0;



	return host->ops->select_drive_strength(host, card, max_dtr, host_drv,

						card_drv, drv_type);

}



static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable)

static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable)

{

{

	/* Host Controller v3.00 defines preset value registers */

	/* Host Controller v3.00 defines preset value registers */
@@ -2308,7 +2295,6 @@ static const struct mmc_host_ops sdhci_ops = { 
	.start_signal_voltage_switch	= sdhci_start_signal_voltage_switch,

	.start_signal_voltage_switch	= sdhci_start_signal_voltage_switch,

	.prepare_hs400_tuning		= sdhci_prepare_hs400_tuning,

	.prepare_hs400_tuning		= sdhci_prepare_hs400_tuning,

	.execute_tuning			= sdhci_execute_tuning,

	.execute_tuning			= sdhci_execute_tuning,

	.select_drive_strength		= sdhci_select_drive_strength,

	.card_event			= sdhci_card_event,

	.card_event			= sdhci_card_event,

	.card_busy	= sdhci_card_busy,

	.card_busy	= sdhci_card_busy,

};

};

drivers/mmc/host/sdhci.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -562,10 +562,6 @@ struct sdhci_ops { 
	void    (*adma_workaround)(struct sdhci_host *host, u32 intmask);

	void    (*adma_workaround)(struct sdhci_host *host, u32 intmask);

	void    (*card_event)(struct sdhci_host *host);

	void    (*card_event)(struct sdhci_host *host);

	void	(*voltage_switch)(struct sdhci_host *host);

	void	(*voltage_switch)(struct sdhci_host *host);

	int	(*select_drive_strength)(struct sdhci_host *host,

					 struct mmc_card *card,

					 unsigned int max_dtr, int host_drv,

					 int card_drv, int *drv_type);

};

};





#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS

#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS