From patchwork Mon Aug 17 08:34:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 507904 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4A9A11402B4; Mon, 17 Aug 2015 18:34:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gDyqhWok; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZRFsb-0006S1-25; Mon, 17 Aug 2015 08:34:53 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZRFsS-0006RO-H7 for kernel-team@lists.ubuntu.com; Mon, 17 Aug 2015 08:34:44 +0000 Received: by pdrg1 with SMTP id g1so53573274pdr.2 for ; Mon, 17 Aug 2015 01:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=iP5vMqJJBIMC3cKH51exLXGm0oTXFdYmTRpycnLHl+U=; b=gDyqhWokIwKu001rq3lG8F1a/GSel8sdeEBt+nAx55mvFm19pvyBxv62l1LP9EeVSy 8wazkyIM+S6+i37TQjSLqId27aBuy9KqqZTrhC3VT34QKI2ia86Lf3w6ppvKDgQ+CcEJ /0Opr0OQL3r4BCqvePuykn6WK2iFTOWg9IMeSI3sw/3EVmgPsbseV4q0BungtPgO2R8Z gMLD95FkizwLBQ7oI9Tlt7pMj8wffkLLfGhhML18LzUJEkhhxwJVmB2Fo42miUTN1Tq+ JuPtRxoLoxJ5LvmQ+YA6bLc4vl4KZ8u7qfDSRn5X7W2DhkNaWz/fpFPzy3bUb0iCSR5r 5dug== X-Received: by 10.70.22.234 with SMTP id h10mr566536pdf.102.1439800483935; Mon, 17 Aug 2015 01:34:43 -0700 (PDT) Received: from localhost ([175.41.48.77]) by smtp.gmail.com with ESMTPSA id em1sm13722401pbd.42.2015.08.17.01.34.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Aug 2015 01:34:43 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] mmc: core: Remove the ->enable|disable() callbacks Date: Mon, 17 Aug 2015 04:34:38 -0400 Message-Id: <1439800479-7928-2-git-send-email-acelan.kao@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439800479-7928-1-git-send-email-acelan.kao@canonical.com> References: <1439800479-7928-1-git-send-email-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: NeilBrown These callbacks have been set to deprecated for some time. The last user (omap_hsmmc) has moved away from using them, which thus enables us to completely remove them. Signed-off-by: NeilBrown Signed-off-by: Ulf Hansson (cherry picked from commit 40433267331bc6b9d70d5cdd14bfa2c8e3e5f0ec) Signed-off-by: AceLan Kao Reviewed-by: Wen-chien Jesse Sung --- drivers/mmc/core/core.c | 5 ----- include/linux/mmc/host.h | 6 ------ 2 files changed, 11 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 113aaec..ad234b9 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -911,8 +911,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort) wake_up(&host->wq); spin_unlock_irqrestore(&host->lock, flags); remove_wait_queue(&host->wq, &wait); - if (host->ops->enable && !stop && host->claim_cnt == 1) - host->ops->enable(host); return stop; } @@ -931,9 +929,6 @@ void mmc_release_host(struct mmc_host *host) WARN_ON(!host->claimed); - if (host->ops->disable && host->claim_cnt == 1) - host->ops->disable(host); - spin_lock_irqsave(&host->lock, flags); if (--host->claim_cnt) { /* Release for nested claim */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 9f32270..ba71419 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -80,12 +80,6 @@ struct mmc_ios { struct mmc_host_ops { /* - * 'enable' is called when the host is claimed and 'disable' is called - * when the host is released. 'enable' and 'disable' are deprecated. - */ - int (*enable)(struct mmc_host *host); - int (*disable)(struct mmc_host *host); - /* * It is optional for the host to implement pre_req and post_req in * order to support double buffering of requests (prepare one * request while another request is active).