Commit b6cbd916 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: swp: Improve code around spi_nor_check_lock_status_sr() 



- bool return value for spi_nor_check_lock_status_sr(), gets rid of
  the return 1,
- introduce temporary variables for better readability.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarPratyush Yadav <p.yadav@ti.com>
Reviewed-by: default avatarMichael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20210322075131.45093-3-tudor.ambarus@microchip.com
parent c4c79510

drivers/mtd/spi-nor/swp.c

+15 −12
Original line number Diff line number Diff line
@@ -81,36 +81,39 @@ static void spi_nor_get_locked_range_sr(struct spi_nor *nor, u8 sr, loff_t *ofs, 
}



/*

 * Return 1 if the entire region is locked (if @locked is true) or unlocked (if

 * @locked is false); 0 otherwise

 * Return true if the entire region is locked (if @locked is true) or unlocked

 * (if @locked is false); false otherwise.

 */

static int spi_nor_check_lock_status_sr(struct spi_nor *nor, loff_t ofs,

static bool spi_nor_check_lock_status_sr(struct spi_nor *nor, loff_t ofs,

					 uint64_t len, u8 sr, bool locked)

{

	loff_t lock_offs;

	loff_t lock_offs, lock_offs_max, offs_max;

	uint64_t lock_len;



	if (!len)

		return 1;

		return true;



	spi_nor_get_locked_range_sr(nor, sr, &lock_offs, &lock_len);



	lock_offs_max = lock_offs + lock_len;

	offs_max = ofs + len;



	if (locked)

		/* Requested range is a sub-range of locked range */

		return (ofs + len <= lock_offs + lock_len) && (ofs >= lock_offs);

		return (offs_max <= lock_offs_max) && (ofs >= lock_offs);

	else

		/* Requested range does not overlap with locked range */

		return (ofs >= lock_offs + lock_len) || (ofs + len <= lock_offs);

		return (ofs >= lock_offs_max) || (offs_max <= lock_offs);

}



static int spi_nor_is_locked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,

static bool spi_nor_is_locked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,

				 u8 sr)

{

	return spi_nor_check_lock_status_sr(nor, ofs, len, sr, true);

}



static int spi_nor_is_unlocked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,

				  u8 sr)

static bool spi_nor_is_unlocked_sr(struct spi_nor *nor, loff_t ofs,

				   uint64_t len, u8 sr)

{

	return spi_nor_check_lock_status_sr(nor, ofs, len, sr, false);

}