From patchwork Mon Aug 6 07:25:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Behme X-Patchwork-Id: 1277021 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E21893FD57 for ; Mon, 6 Aug 2012 07:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753177Ab2HFHZk (ORCPT ); Mon, 6 Aug 2012 03:25:40 -0400 Received: from smtp2-v.fe.bosch.de ([139.15.237.6]:41011 "EHLO smtp2-v.fe.bosch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753049Ab2HFHZM (ORCPT ); Mon, 6 Aug 2012 03:25:12 -0400 Received: from vsmta13.fe.internet.bosch.com (unknown [10.4.98.30]) by imta24.fe.bosch.de (Postfix) with ESMTP id C456EB00214; Mon, 6 Aug 2012 09:25:11 +0200 (CEST) Received: from localhost (vsgw4.fe.internet.bosch.com [10.4.98.12]) by vsmta13.fe.internet.bosch.com (Postfix) with SMTP id B513B384068A; Mon, 6 Aug 2012 09:25:11 +0200 (CEST) Received: from FE-HUB1000.de.bosch.com (10.4.103.107) by fe-hub03.de.bosch.com (10.3.153.62) with Microsoft SMTP Server (TLS) id 8.3.264.0; Mon, 6 Aug 2012 09:25:05 +0200 Received: from hi-z5661.hi.de.bosch.com (10.34.219.178) by FE-HUB1000.de.bosch.com (10.4.103.107) with Microsoft SMTP Server id 14.2.309.2; Mon, 6 Aug 2012 09:25:04 +0200 Received: from localhost.localdomain (localhost [127.0.0.1]) by hi-z5661.hi.de.bosch.com (Postfix) with ESMTP id CD6A040BAE; Mon, 6 Aug 2012 09:25:03 +0200 (CEST) From: Dirk Behme To: CC: , , Dirk Behme , Jassi Brar , Chris Ball Subject: [PATCH 2/2] mmc: block: remove unused name_idx Date: Mon, 6 Aug 2012 09:25:00 +0200 Message-ID: <1344237900-14815-2-git-send-email-dirk.behme@de.bosch.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1344237900-14815-1-git-send-email-dirk.behme@de.bosch.com> References: <1344237900-14815-1-git-send-email-dirk.behme@de.bosch.com> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org With the previous patch "mmc: block: mmcblkN: use slot index instead of dynamic name index" name_idx is not needed any more. Signed-off-by: Dirk Behme CC: Jassi Brar CC: Chris Ball --- drivers/mmc/card/block.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index a01d306..555d840 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -74,7 +74,6 @@ static int max_devices; /* 256 minors, so at most 256 separate devices */ static DECLARE_BITMAP(dev_use, 256); -static DECLARE_BITMAP(name_use, 256); /* * There is one mmc_blk_data per slot. @@ -92,7 +91,6 @@ struct mmc_blk_data { unsigned int usage; unsigned int read_only; unsigned int part_type; - unsigned int name_idx; unsigned int reset_done; #define MMC_BLK_READ BIT(0) #define MMC_BLK_WRITE BIT(1) @@ -1458,19 +1456,6 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, goto out; } - /* - * !subname implies we are creating main mmc_blk_data that will be - * associated with mmc_card with mmc_set_drvdata. Due to device - * partitions, devidx will not coincide with a per-physical card - * index anymore so we keep track of a name index. - */ - if (!subname) { - md->name_idx = find_first_zero_bit(name_use, max_devices); - __set_bit(md->name_idx, name_use); - } else - md->name_idx = ((struct mmc_blk_data *) - dev_to_disk(parent)->private_data)->name_idx; - md->area_type = area_type; /* @@ -1660,7 +1645,6 @@ static void mmc_blk_remove_parts(struct mmc_card *card, struct list_head *pos, *q; struct mmc_blk_data *part_md; - __clear_bit(md->name_idx, name_use); list_for_each_safe(pos, q, &md->part) { part_md = list_entry(pos, struct mmc_blk_data, part); list_del(pos);