From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 11/11] mtd: cfi-flash: remove dead code
Date: Mon, 22 Jun 2015 10:41:06 +0200 [thread overview]
Message-ID: <1434962466-23590-12-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1434962466-23590-1-git-send-email-s.hauer@pengutronix.de>
CFG_FLASH_PROTECTION is never defined, remove the code. Also
remove code inside #if 0.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mtd/nor/cfi_flash.c | 36 ------------------------------------
drivers/mtd/nor/cfi_flash.h | 6 ------
drivers/mtd/nor/cfi_flash_intel.c | 6 ------
3 files changed, 48 deletions(-)
diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c
index b93c663..f9aecad 100644
--- a/drivers/mtd/nor/cfi_flash.c
+++ b/drivers/mtd/nor/cfi_flash.c
@@ -308,9 +308,6 @@ static int flash_detect_size(struct flash_info *info)
info->ext_addr = 0;
info->cfi_version = 0;
-#ifdef CFG_FLASH_PROTECTION
- info->legacy_unlock = 0;
-#endif
/* first only malloc space for the first sector */
info->start = xmalloc(sizeof(*info->eraseregions));
@@ -763,39 +760,6 @@ static void cfi_info (struct device_d* dev)
return;
}
-#if 0
-/*
- * flash_read_user_serial - read the OneTimeProgramming cells
- */
-static void flash_read_user_serial (struct flash_info *info, void *buffer, int offset,
- int len)
-{
- uchar *src;
- uchar *dst;
-
- dst = buffer;
- src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
- flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
- memcpy (dst, src + offset, len);
- flash_write_cmd (info, 0, 0, info->cmd_reset);
-}
-
-/*
- * flash_read_factory_serial - read the device Id from the protection area
- */
-static void flash_read_factory_serial (struct flash_info *info, void *buffer, int offset,
- int len)
-{
- uchar *src;
-
- src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
- flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
- memcpy (buffer, src + offset, len);
- flash_write_cmd (info, 0, 0, info->cmd_reset);
-}
-
-#endif
-
int flash_status_check(struct flash_info *info, flash_sect_t sector,
u64 tout, char *prompt)
{
diff --git a/drivers/mtd/nor/cfi_flash.h b/drivers/mtd/nor/cfi_flash.h
index 6d975b9..e82eb28 100644
--- a/drivers/mtd/nor/cfi_flash.h
+++ b/drivers/mtd/nor/cfi_flash.h
@@ -355,12 +355,6 @@ extern void flash_protect(int flag, unsigned long from, unsigned long to,
struct flash_info *info);
extern int flash_write(char *, unsigned long, unsigned long);
-#if defined(CFG_FLASH_PROTECTION)
-extern int flash_real_protect(struct flash_info *info, long sector, int prot);
-extern void flash_read_user_serial(struct flash_info *info, void *buffer, int offset, int len);
-extern void flash_read_factory_serial(struct flash_info *info, void *buffer, int offset, int len);
-#endif /* CFG_FLASH_PROTECTION */
-
/*-----------------------------------------------------------------------
* Protection Flags for flash_protect():
*/
diff --git a/drivers/mtd/nor/cfi_flash_intel.c b/drivers/mtd/nor/cfi_flash_intel.c
index 835734d..6108d7c 100644
--- a/drivers/mtd/nor/cfi_flash_intel.c
+++ b/drivers/mtd/nor/cfi_flash_intel.c
@@ -154,12 +154,6 @@ static int intel_flash_real_protect(struct flash_info *info, long sector, int pr
static void intel_flash_fixup(struct flash_info *info, struct cfi_qry *qry)
{
-#ifdef CFG_FLASH_PROTECTION
- /* read legacy lock/unlock bit from intel flash */
- if (info->ext_addr)
- info->legacy_unlock = flash_read_uchar(info,
- info->ext_addr + 5) & 0x08;
-#endif
}
struct cfi_cmd_set cfi_cmd_set_intel = {
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2015-06-22 8:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 8:40 cfi-flash cleanups Sascha Hauer
2015-06-22 8:40 ` [PATCH 01/11] mtd: cfi-flash: We can print longlongs Sascha Hauer
2015-06-22 8:40 ` [PATCH 02/11] mtd: cfi-flash: save indention level Sascha Hauer
2015-06-22 8:40 ` [PATCH 03/11] mtd: cfi-flash: statically initialize instead of memset Sascha Hauer
2015-06-22 8:40 ` [PATCH 04/11] mtd: cfi-flash: replace ifdef with IS_ENABLED Sascha Hauer
2015-06-22 8:41 ` [PATCH 05/11] mtd: cfi-flash: remove unnecessary ifdefs Sascha Hauer
2015-06-22 8:41 ` [PATCH 06/11] mtd: cfi-flash: make flash_detect_width more readable Sascha Hauer
2015-06-22 8:41 ` [PATCH 07/11] mtd: cfi-flash: return 0 for success Sascha Hauer
2015-06-22 8:41 ` [PATCH 08/11] mtd: cfi-flash: turn some messages into vdbg Sascha Hauer
2015-06-22 8:41 ` [PATCH 09/11] mtd: cfi-flash: use unaligned accessor functions Sascha Hauer
2015-06-22 8:41 ` [PATCH 10/11] mtd: cfi-flash: Coding style cleanup Sascha Hauer
2015-06-22 8:41 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434962466-23590-12-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox