flash/nor: consolidate flash protect/protect_check

[openocd.git] / src / flash / nor / faux.c

diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index 8198ef52143efbfcd81de5440c948b6116e4922e..d68940fc6ea2dfe86052f9c703111e78d249efd4 100644 (file)
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -87,12 +85,6 @@ static int faux_erase(struct flash_bank *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int faux_protect(struct flash_bank *bank, int set, int first, int last)
-{
-       LOG_USER("set protection sector %d to %d to %s", first, last, set ? "on" : "off");
-       return ERROR_OK;
-}
-
 static int faux_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct faux_flash_bank *info = bank->driver_priv;
@@ -100,11 +92,6 @@ static int faux_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t o
        return ERROR_OK;
 }
 
-static int faux_protect_check(struct flash_bank *bank)
-{
-       return ERROR_OK;
-}
-
 static int faux_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "faux flash driver");
@@ -131,12 +118,11 @@ struct flash_driver faux_flash = {
        .commands = faux_command_handlers,
        .flash_bank_command = faux_flash_bank_command,
        .erase = faux_erase,
-       .protect = faux_protect,
        .write = faux_write,
        .read = default_flash_read,
        .probe = faux_probe,
        .auto_probe = faux_probe,
        .erase_check = default_flash_blank_check,
-       .protect_check = faux_protect_check,
-       .info = faux_info
+       .info = faux_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };