From patchwork Tue Sep 7 11:29:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 178032 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Tue, 07 Sep 2010 12:29:46 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OswN0-0004R4-1J for chris@printf.net; Tue, 07 Sep 2010 12:29:46 +0100 Received: by mail.laptop.org (Postfix) id 30F4C2499C; Tue, 7 Sep 2010 07:29:26 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 1CBC924999 for ; Tue, 7 Sep 2010 07:29:26 -0400 (EDT) X-ASG-Debug-ID: 1283858979-0b74e4e00001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id F7MWxE63pnYtAWAc for ; Tue, 07 Sep 2010 07:29:40 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756480Ab0IGL3h (ORCPT ); Tue, 7 Sep 2010 07:29:37 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:49491 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756257Ab0IGL3h (ORCPT ); Tue, 7 Sep 2010 07:29:37 -0400 Received: by mail-fx0-f46.google.com with SMTP id 13so2890806fxm.19 for ; Tue, 07 Sep 2010 04:29:36 -0700 (PDT) Received: by 10.223.124.4 with SMTP id s4mr1980292far.31.1283858976005; Tue, 07 Sep 2010 04:29:36 -0700 (PDT) Received: from localhost.localdomain (46-116-15-195.bb.netvision.net.il [46.116.15.195]) by mx.google.com with ESMTPS id r8sm2764094faq.34.2010.09.07.04.29.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Sep 2010 04:29:34 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: Luciano Coelho , , San Mehat , Roger Quadros , Nicolas Pitre , Gao Yunpeng , Ohad Ben-Cohen X-ASG-Orig-Subj: [PATCH v1 1/8] mmc: sdio: fully reconfigure oldcard on resume Subject: [PATCH v1 1/8] mmc: sdio: fully reconfigure oldcard on resume Date: Tue, 7 Sep 2010 14:29:02 +0300 Message-Id: <1283858949-11073-2-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283858949-11073-1-git-send-email-ohad@wizery.com> References: <1283858949-11073-1-git-send-email-ohad@wizery.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1283858979 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40182 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index bd2755e..8a34945 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -457,7 +457,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, return -ENOENT; card = oldcard; - return 0; } if (card->type == MMC_TYPE_SD_COMBO) { @@ -615,14 +614,6 @@ static int mmc_sdio_resume(struct mmc_host *host) mmc_claim_host(host); err = mmc_sdio_init_card(host, host->ocr, host->card, (host->pm_flags & MMC_PM_KEEP_POWER)); - if (!err) { - /* We may have switched to 1-bit mode during suspend. */ - err = sdio_enable_4bit_bus(host->card); - if (err > 0) { - mmc_set_bus_width(host, MMC_BUS_WIDTH_4); - err = 0; - } - } if (!err && host->sdio_irqs) mmc_signal_sdio_irq(host); mmc_release_host(host);