From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wg0-f50.google.com ([74.125.82.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSMcc-0002I0-TE for linux-mtd@lists.infradead.org; Tue, 25 Mar 2014 08:22:11 +0000 Received: by mail-wg0-f50.google.com with SMTP id x13so76314wgg.33 for ; Tue, 25 Mar 2014 01:21:49 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC 47/47] mtd: nand: stm_nand_bch: catch unsupported calls Date: Tue, 25 Mar 2014 08:20:04 +0000 Message-Id: <1395735604-26706-48-git-send-email-lee.jones@linaro.org> In-Reply-To: <1395735604-26706-1-git-send-email-lee.jones@linaro.org> References: <1395735604-26706-1-git-send-email-lee.jones@linaro.org> Cc: angus.clark@st.com, kernel@stlinux.com, lee.jones@linaro.org, linux-mtd@lists.infradead.org, pekon@ti.com, computersforpeace@gmail.com, dwmw2@infradead.org List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Display a BUG() message and return appropriate/expected value. Signed-off-by: Lee Jones --- drivers/mtd/nand/stm_nand_bch.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/mtd/nand/stm_nand_bch.c b/drivers/mtd/nand/stm_nand_bch.c index 4103d4f..e732bf3 100644 --- a/drivers/mtd/nand/stm_nand_bch.c +++ b/drivers/mtd/nand/stm_nand_bch.c @@ -852,6 +852,31 @@ static void flex_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len) } } +/* Catch calls to non-supported functions */ +static uint16_t flex_read_word_bug(struct mtd_info *mtd) +{ + BUG(); + return 0; +} + +static int flex_block_bad_bug(struct mtd_info *mtd, loff_t ofs, int getchip) +{ + BUG(); + return 1; +} + +static int flex_block_markbad_bug(struct mtd_info *mtd, loff_t ofs) +{ + BUG(); + return 1; +} + +int flex_scan_bbt_bug(struct mtd_info *mtd) +{ + BUG(); + return 1; +} + /* * Hamming-FLEX operations (optimised replacements for nand_base.c versions) */ @@ -1916,7 +1941,12 @@ static void nandi_set_mtd_defaults(struct nandi_controller *nandi, chip->read_buf = flex_read_buf; chip->write_buf = flex_write_buf; + chip->read_word = flex_read_word_bug; + chip->block_bad = flex_block_bad_bug; + chip->block_markbad = flex_block_markbad_bug; + chip->bbt_options |= NAND_BBT_USE_FLASH; + chip->scan_bbt = flex_scan_bbt_bug; /* mtd_info */ mtd->owner = THIS_MODULE; -- 1.8.3.2