@@ -191,8 +191,7 @@ static int regmap_encx24j600_sfr_clr_bits(struct encx24j600_context *ctx,
static int regmap_encx24j600_reg_update_bits(void *context, unsigned int reg,
unsigned int mask,
- unsigned int val, bool *change,
- bool force_write)
+ unsigned int val)
{
struct encx24j600_context *ctx = context;
@@ -200,61 +199,24 @@ static int regmap_encx24j600_reg_update_bits(void *context, unsigned int reg,
unsigned int set_mask = mask & val;
unsigned int clr_mask = mask & ~val;
- if (change)
- *change = false;
-
- if ((reg >= 0x40 && reg < 0x6c) || reg >= 0x80) {
- /* Must do read/modify/write cycles for
- * MAC/MII regs or Unbanked SFR regs
- */
- u16 tmp, orig;
-
- ret = regmap_encx24j600_sfr_read(context, reg, (u8 *)&orig,
- sizeof(orig));
- if (ret != 0)
- return ret;
-
- tmp = orig & ~mask;
- tmp |= val & mask;
-
- if (force_write || (tmp != orig)) {
- ret = regmap_encx24j600_sfr_write(context, reg,
- (u8 *)&tmp,
- sizeof(tmp));
- if (change)
- *change = true;
- } else if (change) {
- *change = false;
- }
-
- return ret;
- }
+ if ((reg >= 0x40 && reg < 0x6c) || reg >= 0x80)
+ return -EINVAL;
- if (set_mask & 0xff) {
+ if (set_mask & 0xff)
ret = regmap_encx24j600_sfr_set_bits(ctx, reg, set_mask);
- if (ret == 0 && change)
- *change = true;
- }
+
set_mask = (set_mask & 0xff00) >> 8;
- if ((set_mask & 0xff) && (ret == 0)) {
+ if ((set_mask & 0xff) && (ret == 0))
ret = regmap_encx24j600_sfr_set_bits(ctx, reg + 1, set_mask);
- if (ret == 0 && change)
- *change = true;
- }
- if ((clr_mask & 0xff) && (ret == 0)) {
+ if ((clr_mask & 0xff) && (ret == 0))
ret = regmap_encx24j600_sfr_clr_bits(ctx, reg, clr_mask);
- if (ret == 0 && change)
- *change = true;
- }
+
clr_mask = (clr_mask & 0xff00) >> 8;
- if ((clr_mask & 0xff) && (ret == 0)) {
+ if ((clr_mask & 0xff) && (ret == 0))
ret = regmap_encx24j600_sfr_clr_bits(ctx, reg + 1, clr_mask);
- if (ret == 0 && change)
- *change = true;
- }
return ret;
}