Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f07bedc3 authored by John Keeping's avatar John Keeping Committed by Linus Walleij
Browse files

pinctrl: rockchip: remove unnecessary locking 



regmap_update_bits does its own locking and everything else accessed
here is a local variable so there is no need to lock around it.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 35099234

drivers/pinctrl/pinctrl-rockchip.c

+2 −31
Original line number Diff line number Diff line
@@ -652,7 +652,6 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 
	int iomux_num = (pin / 8);

	struct regmap *regmap;

	int reg, ret, mask, mux_type;

	unsigned long flags;

	u8 bit;

	u32 data, rmask;
@@ -701,15 +700,11 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 
	if (ctrl->iomux_recalc && (mux_type & IOMUX_RECALCED))

		ctrl->iomux_recalc(bank->bank_num, pin, &reg, &bit, &mask);



	spin_lock_irqsave(&bank->slock, flags);



	data = (mask << (bit + 16));

	rmask = data | (data >> 16);

	data |= (mux & mask) << bit;

	ret = regmap_update_bits(regmap, reg, rmask, data);



	spin_unlock_irqrestore(&bank->slock, flags);



	return ret;

}
@@ -1135,7 +1130,6 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, 
	struct rockchip_pinctrl *info = bank->drvdata;

	struct rockchip_pin_ctrl *ctrl = info->ctrl;

	struct regmap *regmap;

	unsigned long flags;

	int reg, ret, i;

	u32 data, rmask, rmask_bits, temp;

	u8 bit;
@@ -1163,8 +1157,6 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, 
		return ret;

	}



	spin_lock_irqsave(&bank->slock, flags);



	switch (drv_type) {

	case DRV_TYPE_IO_1V8_3V0_AUTO:

	case DRV_TYPE_IO_3V3_ONLY:
@@ -1185,17 +1177,14 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, 
			rmask = BIT(15) | BIT(31);

			data |= BIT(31);

			ret = regmap_update_bits(regmap, reg, rmask, data);

			if (ret) {

				spin_unlock_irqrestore(&bank->slock, flags);

			if (ret)

				return ret;

			}



			rmask = 0x3 | (0x3 << 16);

			temp |= (0x3 << 16);

			reg += 0x4;

			ret = regmap_update_bits(regmap, reg, rmask, temp);



			spin_unlock_irqrestore(&bank->slock, flags);

			return ret;

		case 18 ... 21:

			/* setting fully enclosed in the second register */
@@ -1203,7 +1192,6 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, 
			bit -= 16;

			break;

		default:

			spin_unlock_irqrestore(&bank->slock, flags);

			dev_err(info->dev, "unsupported bit: %d for pinctrl drive type: %d\n",

				bit, drv_type);

			return -EINVAL;
@@ -1215,7 +1203,6 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, 
		rmask_bits = RK3288_DRV_BITS_PER_PIN;

		break;

	default:

		spin_unlock_irqrestore(&bank->slock, flags);

		dev_err(info->dev, "unsupported pinctrl drive type: %d\n",

			drv_type);

		return -EINVAL;
@@ -1227,7 +1214,6 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, 
	data |= (ret << bit);



	ret = regmap_update_bits(regmap, reg, rmask, data);

	spin_unlock_irqrestore(&bank->slock, flags);



	return ret;

}
@@ -1294,7 +1280,6 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 
	struct rockchip_pin_ctrl *ctrl = info->ctrl;

	struct regmap *regmap;

	int reg, ret, i, pull_type;

	unsigned long flags;

	u8 bit;

	u32 data, rmask;
@@ -1309,14 +1294,10 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 


	switch (ctrl->type) {

	case RK2928:

		spin_lock_irqsave(&bank->slock, flags);



		data = BIT(bit + 16);

		if (pull == PIN_CONFIG_BIAS_DISABLE)

			data |= BIT(bit);

		ret = regmap_write(regmap, reg, data);



		spin_unlock_irqrestore(&bank->slock, flags);

		break;

	case RV1108:

	case RK3188:
@@ -1339,16 +1320,12 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 
			return ret;

		}



		spin_lock_irqsave(&bank->slock, flags);



		/* enable the write to the equivalent lower bits */

		data = ((1 << RK3188_PULL_BITS_PER_PIN) - 1) << (bit + 16);

		rmask = data | (data >> 16);

		data |= (ret << bit);



		ret = regmap_update_bits(regmap, reg, rmask, data);



		spin_unlock_irqrestore(&bank->slock, flags);

		break;

	default:

		dev_err(info->dev, "unsupported pinctrl type\n");
@@ -1408,7 +1385,6 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, 
	struct rockchip_pin_ctrl *ctrl = info->ctrl;

	struct regmap *regmap;

	int reg, ret;

	unsigned long flags;

	u8 bit;

	u32 data, rmask;
@@ -1419,16 +1395,11 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, 
	if (ret)

		return ret;



	spin_lock_irqsave(&bank->slock, flags);



	/* enable the write to the equivalent lower bits */

	data = BIT(bit + 16) | (enable << bit);

	rmask = BIT(bit + 16) | BIT(bit);



	ret = regmap_update_bits(regmap, reg, rmask, data);

	spin_unlock_irqrestore(&bank->slock, flags);



	return ret;

	return regmap_update_bits(regmap, reg, rmask, data);

}



/*