Merge "mmc: core: remove shutdown handler" (93d2d1ca) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/core/mmc.c

+0 −22

Original line number	Diff line number	Diff line
		@@ -2348,27 +2348,6 @@ out:
		return err;
		}

		/*
		* Shutdown callback
		*/
		static int mmc_shutdown(struct mmc_host *host)
		{
		int err = 0;

		/*
		* In a specific case for poweroff notify, we need to resume the card
		* before we can shutdown it properly.
		*/
		if (mmc_can_poweroff_notify(host->card) &&
		!(host->caps2 & MMC_CAP2_FULL_PWR_CYCLE))
		err = _mmc_resume(host);

		if (!err)
		err = _mmc_suspend(host, false);

		return err;
		}

		/*
		* Callback for resume.
		*/
		@@ -2519,7 +2498,6 @@ static const struct mmc_bus_ops mmc_ops = {
		.runtime_idle = mmc_runtime_idle,
		.power_restore = mmc_power_restore,
		.alive = mmc_alive,
		.shutdown = mmc_shutdown,
		.change_bus_speed = mmc_change_bus_speed,
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -1360,7 +1360,6 @@ static const struct mmc_bus_ops mmc_sd_ops = {
		.resume = mmc_sd_resume,
		.power_restore = mmc_sd_power_restore,
		.alive = mmc_sd_alive,
		.shutdown = mmc_sd_suspend,
		.change_bus_speed = mmc_sd_change_bus_speed,
		};