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

Commit e7c5412f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC fix from Ulf Hansson:
 "MMC host:

   - dw_mmc: fix the spamming log message"

* tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: dw_mmc: fix the spamming log message
parents e47f2e50 005d675a

drivers/mmc/host/dw_mmc.c

+9 −5
Original line number Diff line number Diff line
@@ -1112,6 +1112,7 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) 


		div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0;



		if (clock != slot->__clk_old || force_clkinit)

			dev_info(&slot->mmc->class_dev,

				 "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",

				 slot->id, host->bus_hz, clock,
@@ -1139,6 +1140,9 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) 


		/* inform CIU */

		mci_send_cmd(slot, sdmmc_cmd_bits, 0);



		/* keep the last clock value that was requested from core */

		slot->__clk_old = clock;

	}



	host->current_speed = clock;

drivers/mmc/host/dw_mmc.h

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ extern int dw_mci_resume(struct dw_mci *host); 
 * @queue_node: List node for placing this node in the @queue list of

 *	&struct dw_mci.

 * @clock: Clock rate configured by set_ios(). Protected by host->lock.

 * @__clk_old: The last clock value that was requested from core.

 *	Keeping track of this helps us to avoid spamming the console.

 * @flags: Random state bits associated with the slot.

 * @id: Number of this slot.

 * @sdio_id: Number of this slot in the SDIO interrupt registers.
@@ -263,6 +265,7 @@ struct dw_mci_slot { 
	struct list_head	queue_node;



	unsigned int		clock;

	unsigned int		__clk_old;



	unsigned long		flags;

#define DW_MMC_CARD_PRESENT	0