From patchwork Tue Sep 7 22:30:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 178152 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 23:30:16 +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 1Ot6gC-0006oH-96 for chris@printf.net; Tue, 07 Sep 2010 23:30:16 +0100 Received: by mail.laptop.org (Postfix) id 92FC12446E; Tue, 7 Sep 2010 18:29:56 -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 7ADC02446D for ; Tue, 7 Sep 2010 18:29:56 -0400 (EDT) X-ASG-Debug-ID: 1283898608-0b746c9b0001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id glcghHGNW2X1yVAE for ; Tue, 07 Sep 2010 18:30:08 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755704Ab0IGWaH (ORCPT ); Tue, 7 Sep 2010 18:30:07 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:49093 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751080Ab0IGWaF (ORCPT ); Tue, 7 Sep 2010 18:30:05 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o87MU1FF021608 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 7 Sep 2010 15:30:01 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o87MU1lp010207; Tue, 7 Sep 2010 15:30:01 -0700 Message-Id: <201009072230.o87MU1lp010207@imap1.linux-foundation.org> X-ASG-Orig-Subj: + mmc_test-use-api-to-check-card-type.patch added to -mm tree Subject: + mmc_test-use-api-to-check-card-type.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: andy.shevchenko@gmail.com, ext-andriy.shevchenko@nokia.com, linux-mmc@vger.kernel.org From: akpm@linux-foundation.org Date: Tue, 07 Sep 2010 15:30:01 -0700 X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 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: 1283898608 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=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40226 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name diff -puN drivers/mmc/card/mmc_test.c~mmc_test-use-api-to-check-card-type drivers/mmc/card/mmc_test.c --- a/drivers/mmc/card/mmc_test.c~mmc_test-use-api-to-check-card-type +++ a/drivers/mmc/card/mmc_test.c @@ -1977,7 +1977,7 @@ static int mmc_test_probe(struct mmc_car { int ret; - if ((card->type != MMC_TYPE_MMC) && (card->type != MMC_TYPE_SD)) + if (!mmc_card_mmc(card) && !mmc_card_sd(card)) return -ENODEV; ret = device_create_file(&card->dev, &dev_attr_test);