From patchwork Tue Aug 23 09:27:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 111065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5484AB6FD7 for ; Tue, 23 Aug 2011 19:28:20 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QvnHC-0000cr-GY; Tue, 23 Aug 2011 09:28:06 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QvnHC-00051q-0U; Tue, 23 Aug 2011 09:28:06 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QvnH8-00051W-DE for linux-mtd@lists.infradead.org; Tue, 23 Aug 2011 09:28:03 +0000 Received: by wyh11 with SMTP id 11so4981404wyh.36 for ; Tue, 23 Aug 2011 02:27:59 -0700 (PDT) Received: by 10.227.37.17 with SMTP id v17mr110592wbd.2.1314091679045; Tue, 23 Aug 2011 02:27:59 -0700 (PDT) Received: from localhost (gw-ba1.picochip.com [94.175.234.108]) by mx.google.com with ESMTPS id p18sm4248862wbh.55.2011.08.23.02.27.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 02:27:58 -0700 (PDT) From: Jamie Iles To: linux-mtd@lists.infradead.org Subject: [PATCH] mtd: fix compile warning with newer GCC in flash maps Date: Tue, 23 Aug 2011 10:27:50 +0100 Message-Id: <1314091670-15175-1-git-send-email-jamie@jamieiles.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110823_052802_574432_63F7CECA X-CRM114-Status: GOOD ( 13.34 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] Cc: Jamie Iles , David Woodhouse , Artem Bityutskiy X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org For invalid map bankwidths, BUG() out for map_word_load() and inline_map_write() like inline_map_read() does. This fixes the warning below and for other maps. drivers/mtd/chips/cfi_cmdset_0002.c: In function 'cfi_amdstd_write_words': include/linux/mtd/map.h:330:11: warning: 'r$x$0' may be used uninitialized in this function Cc: Artem Bityutskiy Cc: David Woodhouse Signed-off-by: Jamie Iles --- include/linux/mtd/map.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index a9e6ba4..cbc5a3d 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -341,6 +341,8 @@ static inline map_word map_word_load(struct map_info *map, const void *ptr) #endif else if (map_bankwidth_is_large(map)) memcpy(r.x, ptr, map->bankwidth); + else + BUG(); return r; } @@ -424,6 +426,9 @@ static inline void inline_map_write(struct map_info *map, const map_word datum, #endif else if (map_bankwidth_is_large(map)) memcpy_toio(map->virt+ofs, datum.x, map->bankwidth); + else + BUG(); + mb(); }