reset: remove request and free functions

index 3147a50..b776adf 100644
@@ -10,7 +10,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
 
-static int tegra_car_reset_request(struct reset_ctl *reset_ctl)
+static int tegra_car_reset_assert(struct reset_ctl *reset_ctl)
 {
 	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
 	      reset_ctl->dev, reset_ctl->id);

@@ -19,22 +19,6 @@ static int tegra_car_reset_request(struct reset_ctl *reset_ctl)
 	if (reset_ctl->id >= PERIPH_ID_COUNT)
 		return -EINVAL;
 
-	return 0;
-}
-
-static int tegra_car_reset_free(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
-static int tegra_car_reset_assert(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
 	reset_set_enable(reset_ctl->id, 1);
 
 	return 0;

@@ -45,14 +29,16 @@ static int tegra_car_reset_deassert(struct reset_ctl *reset_ctl)
 	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
 	      reset_ctl->dev, reset_ctl->id);
 
+	/* PERIPH_ID_COUNT varies per SoC */
+	if (reset_ctl->id >= PERIPH_ID_COUNT)
+		return -EINVAL;
+
 	reset_set_enable(reset_ctl->id, 0);
 
 	return 0;
 }
 
 struct reset_ops tegra_car_reset_ops = {
-	.request = tegra_car_reset_request,
-	.free = tegra_car_reset_free,
 	.rst_assert = tegra_car_reset_assert,
 	.rst_deassert = tegra_car_reset_deassert,
 };

index 228adda..f83c50b 100644
@@ -10,22 +10,6 @@
 #include <reset-uclass.h>
 #include <asm/arch-tegra/bpmp_abi.h>
 
-static int tegra186_reset_request(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
-static int tegra186_reset_free(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
 static int tegra186_reset_common(struct reset_ctl *reset_ctl,
 				 enum mrq_reset_commands cmd)
 {

@@ -60,8 +44,6 @@ static int tegra186_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops tegra186_reset_ops = {
-	.request = tegra186_reset_request,
-	.free = tegra186_reset_free,
 	.rst_assert = tegra186_reset_assert,
 	.rst_deassert = tegra186_reset_deassert,
 };

index 0fc5a28..672dd97 100644
@@ -277,16 +277,6 @@ static int sti_reset_program_hw(struct reset_ctl *reset_ctl, int assert)
 	return 0;
 }
 
-static int sti_reset_request(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
-static int sti_reset_free(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
 static int sti_reset_assert(struct reset_ctl *reset_ctl)
 {
 	return sti_reset_program_hw(reset_ctl, true);

@@ -298,8 +288,6 @@ static int sti_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops sti_reset_ops = {
-	.request = sti_reset_request,
-	.free = sti_reset_free,
 	.rst_assert = sti_reset_assert,
 	.rst_deassert = sti_reset_deassert,
 };

index e98f34b..efde745 100644
@@ -23,16 +23,6 @@ struct stm32_reset_priv {
 	fdt_addr_t base;
 };
 
-static int stm32_reset_request(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
-static int stm32_reset_free(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
 static int stm32_reset_assert(struct reset_ctl *reset_ctl)
 {
 	struct stm32_reset_priv *priv = dev_get_priv(reset_ctl->dev);

@@ -68,8 +58,6 @@ static int stm32_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 static const struct reset_ops stm32_reset_ops = {
-	.request	= stm32_reset_request,
-	.free		= stm32_reset_free,
 	.rst_assert	= stm32_reset_assert,
 	.rst_deassert	= stm32_reset_deassert,
 };

index a40cea5..5b1d923 100644
@@ -171,16 +171,6 @@ struct uniphier_reset_priv {
 	const struct uniphier_reset_data *data;
 };
 
-static int uniphier_reset_request(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
-static int uniphier_reset_free(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
 static int uniphier_reset_update(struct reset_ctl *reset_ctl, int assert)
 {
 	struct uniphier_reset_priv *priv = dev_get_priv(reset_ctl->dev);

@@ -226,8 +216,6 @@ static int uniphier_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 static const struct reset_ops uniphier_reset_ops = {
-	.request = uniphier_reset_request,
-	.free = uniphier_reset_free,
 	.rst_assert = uniphier_reset_assert,
 	.rst_deassert = uniphier_reset_deassert,
 };

index 01047a2..5eecd51 100644
@@ -24,27 +24,6 @@ struct rockchip_reset_priv {
 	u32 reset_reg_num;
 };
 
-static int rockchip_reset_request(struct reset_ctl *reset_ctl)
-{
-	struct rockchip_reset_priv *priv = dev_get_priv(reset_ctl->dev);
-
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu) (reg_num=%d)\n", __func__,
-	      reset_ctl, reset_ctl->dev, reset_ctl->id, priv->reset_reg_num);
-
-	if (reset_ctl->id / ROCKCHIP_RESET_NUM_IN_REG >= priv->reset_reg_num)
-		return -EINVAL;
-
-	return 0;
-}
-
-static int rockchip_reset_free(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
 static int rockchip_reset_assert(struct reset_ctl *reset_ctl)
 {
 	struct rockchip_reset_priv *priv = dev_get_priv(reset_ctl->dev);

@@ -55,6 +34,9 @@ static int rockchip_reset_assert(struct reset_ctl *reset_ctl)
 	      reset_ctl, reset_ctl->dev, reset_ctl->id,
 	      priv->base + (bank * 4));
 
+	if (reset_ctl->id / ROCKCHIP_RESET_NUM_IN_REG >= priv->reset_reg_num)
+		return -EINVAL;
+
 	rk_setreg(priv->base + (bank * 4), BIT(offset));
 
 	return 0;

@@ -76,8 +58,6 @@ static int rockchip_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops rockchip_reset_ops = {
-	.request = rockchip_reset_request,
-	.free = rockchip_reset_free,
 	.rst_assert = rockchip_reset_assert,
 	.rst_deassert = rockchip_reset_deassert,
 };

index 5324f86..8bbaa6c 100644
@@ -20,19 +20,6 @@ struct meson_reset_priv {
 	struct regmap *regmap;
 };
 
-static int meson_reset_request(struct reset_ctl *reset_ctl)
-{
-	if (reset_ctl->id > (REG_COUNT * BITS_PER_REG))
-		return -EINVAL;
-
-	return 0;
-}
-
-static int meson_reset_free(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
 static int meson_reset_level(struct reset_ctl *reset_ctl, bool assert)
 {
 	struct meson_reset_priv *priv = dev_get_priv(reset_ctl->dev);

@@ -41,6 +28,9 @@ static int meson_reset_level(struct reset_ctl *reset_ctl, bool assert)
 	uint reg_offset = LEVEL_OFFSET + (bank << 2);
 	uint val;
 
+	if (reset_ctl->id > (REG_COUNT * BITS_PER_REG))
+		return -EINVAL;
+
 	regmap_read(priv->regmap, reg_offset, &val);
 	if (assert)
 		val &= ~BIT(offset);

@@ -62,8 +52,6 @@ static int meson_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops meson_reset_ops = {
-	.request = meson_reset_request,
-	.free = meson_reset_free,
 	.rst_assert = meson_reset_assert,
 	.rst_deassert = meson_reset_deassert,
 };

index ebf6bee..b49a2f1 100644
@@ -23,6 +23,9 @@ static int bcm6345_reset_assert(struct reset_ctl *rst)
 {
 	struct bcm6345_reset_priv *priv = dev_get_priv(rst->dev);
 
+	if (rst->id >= MAX_RESETS)
+		return -EINVAL;
+
 	clrbits_be32(priv->regs, BIT(rst->id));
 	mdelay(20);
 

@@ -33,28 +36,16 @@ static int bcm6345_reset_deassert(struct reset_ctl *rst)
 {
 	struct bcm6345_reset_priv *priv = dev_get_priv(rst->dev);
 
+	if (rst->id >= MAX_RESETS)
+		return -EINVAL;
+
 	setbits_be32(priv->regs, BIT(rst->id));
 	mdelay(20);
 
 	return 0;
 }
 
-static int bcm6345_reset_free(struct reset_ctl *rst)
-{
-	return 0;
-}
-
-static int bcm6345_reset_request(struct reset_ctl *rst)
-{
-	if (rst->id >= MAX_RESETS)
-		return -EINVAL;
-
-	return bcm6345_reset_assert(rst);
-}
-
 struct reset_ops bcm6345_reset_reset_ops = {
-	.free = bcm6345_reset_free,
-	.request = bcm6345_reset_request,
 	.rst_assert = bcm6345_reset_assert,
 	.rst_deassert = bcm6345_reset_deassert,
 };

index b2c89e1..65708cf 100644
@@ -68,14 +68,6 @@ static int ast2500_reset_assert(struct reset_ctl *reset_ctl)
 	return ret;
 }
 
-static int ast2500_reset_request(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
 static int ast2500_reset_probe(struct udevice *dev)
 {
 	struct ast2500_reset_priv *priv = dev_get_priv(dev);

@@ -92,7 +84,6 @@ static const struct udevice_id ast2500_reset_ids[] = {
 
 struct reset_ops ast2500_reset_ops = {
 	.rst_assert = ast2500_reset_assert,
-	.request = ast2500_reset_request,
 };
 
 U_BOOT_DRIVER(ast2500_reset) = {

index 466455d..3d04132 100644
@@ -52,25 +52,7 @@ static int socfpga_reset_deassert(struct reset_ctl *reset_ctl)
 	return 0;
 }
 
-static int socfpga_reset_request(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__,
-	      reset_ctl, reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
-static int socfpga_reset_free(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl,
-	      reset_ctl->dev, reset_ctl->id);
-
-	return 0;
-}
-
 static const struct reset_ops socfpga_reset_ops = {
-	.request = socfpga_reset_request,
-	.free = socfpga_reset_free,
 	.rst_assert = socfpga_reset_assert,
 	.rst_deassert = socfpga_reset_deassert,
 };

index c310749..a75143f 100644
@@ -20,29 +20,15 @@ struct sandbox_reset {
 	struct sandbox_reset_signal signals[SANDBOX_RESET_SIGNALS];
 };
 
-static int sandbox_reset_request(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
-
-	if (reset_ctl->id >= SANDBOX_RESET_SIGNALS)
-		return -EINVAL;
-
-	return 0;
-}
-
-static int sandbox_reset_free(struct reset_ctl *reset_ctl)
-{
-	debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
-
-	return 0;
-}
-
 static int sandbox_reset_assert(struct reset_ctl *reset_ctl)
 {
 	struct sandbox_reset *sbr = dev_get_priv(reset_ctl->dev);
 
 	debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
+	if (reset_ctl->id >= SANDBOX_RESET_SIGNALS)
+		return -EINVAL;
+
 	sbr->signals[reset_ctl->id].asserted = true;
 
 	return 0;

@@ -54,6 +40,9 @@ static int sandbox_reset_deassert(struct reset_ctl *reset_ctl)
 
 	debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
+	if (reset_ctl->id >= SANDBOX_RESET_SIGNALS)
+		return -EINVAL;
+
 	sbr->signals[reset_ctl->id].asserted = false;
 
 	return 0;

@@ -79,8 +68,6 @@ static const struct udevice_id sandbox_reset_ids[] = {
 };
 
 struct reset_ops sandbox_reset_reset_ops = {
-	.request = sandbox_reset_request,
-	.free = sandbox_reset_free,
 	.rst_assert = sandbox_reset_assert,
 	.rst_deassert = sandbox_reset_deassert,
 };

index 232e803..a3f1b40 100644
@@ -1371,7 +1371,6 @@ static int eqos_probe_resources_tegra186(struct udevice *dev)
 				   GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
 	if (ret) {
 		pr_err("gpio_request_by_name(phy reset) failed: %d", ret);
-		goto err_free_reset_eqos;
 	}
 
 	ret = clk_get_by_name(dev, "slave_bus", &eqos->clk_slave_bus);

@@ -1418,8 +1417,6 @@ err_free_clk_slave_bus:
 	clk_free(&eqos->clk_slave_bus);
 err_free_gpio_phy_reset:
 	dm_gpio_free(dev, &eqos->phy_reset_gpio);
-err_free_reset_eqos:
-	reset_free(&eqos->reset_ctl);
 
 	debug("%s: returns %d\n", __func__, ret);
 	return ret;

@@ -1437,7 +1434,6 @@ static int eqos_remove_resources_tegra186(struct udevice *dev)
 	clk_free(&eqos->clk_slave_bus);
 	clk_free(&eqos->clk_master_bus);
 	dm_gpio_free(dev, &eqos->phy_reset_gpio);
-	reset_free(&eqos->reset_ctl);
 
 	debug("%s: OK\n", __func__);
 	return 0;

index 6d54214..70907be 100644
@@ -125,10 +125,6 @@ static int bcm6318_usbh_probe(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = reset_free(&rst_ctl);
-	if (ret < 0)
-		return ret;
-
 	mdelay(100);
 
 	return 0;

index 169ee0e..2cc04e1 100644
@@ -77,10 +77,6 @@ static int bcm6348_usbh_probe(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = reset_free(&rst_ctl);
-	if (ret < 0)
-		return ret;
-
 	return 0;
 }
 

index e000316..0440388 100644
@@ -77,10 +77,6 @@ static int bcm6358_usbh_probe(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = reset_free(&rst_ctl);
-	if (ret < 0)
-		return ret;
-
 	return 0;
 }
 

index 71abc0f..38dd5e0 100644
@@ -165,10 +165,6 @@ static int bcm6368_usbh_probe(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = reset_free(&rst_ctl);
-	if (ret < 0)
-		return ret;
-
 	/* enable usb_ref clock */
 	ret = clk_get_by_name(dev, "usb_ref", &clk);
 	if (!ret) {

index 3393166..ddf75f0 100644
@@ -383,10 +383,6 @@ static int bcm63xx_hsspi_probe(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = reset_free(&rst_ctl);
-	if (ret < 0)
-		return ret;
-
 	/* initialize hardware */
 	writel_be(0, priv->regs + SPI_IR_MASK_REG);
 

index f0df687..71bb07d 100644
@@ -409,10 +409,6 @@ static int bcm63xx_spi_probe(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = reset_free(&rst_ctl);
-	if (ret < 0)
-		return ret;
-
 	/* initialize hardware */
 	writeb_be(0, priv->base + regs[SPI_IR_MASK]);
 

index b012d86..8ed6a27 100644
@@ -133,7 +133,6 @@ static int ehci_usb_probe(struct udevice *dev)
 			if (reset_deassert(&priv->resets[i])) {
 				dev_err(dev, "failed to deassert reset %d\n",
 					i);
-				reset_free(&priv->resets[i]);
 				goto reset_err;
 			}
 			priv->reset_count++;

index 5bdd799..f61c0fc 100644
@@ -125,7 +125,6 @@ static int ohci_usb_probe(struct udevice *dev)
 			err = reset_deassert(&priv->resets[i]);
 			if (err) {
 				dev_err(dev, "failed to deassert reset %d\n", i);
-				reset_free(&priv->resets[i]);
 				goto reset_err;
 			}
 			priv->reset_count++;

index 0cd7702..c54b266 100644
@@ -19,7 +19,6 @@ int sandbox_reset_test_assert(struct udevice *dev);
 int sandbox_reset_test_assert_bulk(struct udevice *dev);
 int sandbox_reset_test_deassert(struct udevice *dev);
 int sandbox_reset_test_deassert_bulk(struct udevice *dev);
-int sandbox_reset_test_free(struct udevice *dev);
 int sandbox_reset_test_release_bulk(struct udevice *dev);
 
 #endif

index f0ceaa0..91a1f6e 100644
@@ -57,13 +57,6 @@ int sandbox_reset_test_deassert_bulk(struct udevice *dev)
 	return reset_deassert_bulk(&sbrt->bulk);
 }
 
-int sandbox_reset_test_free(struct udevice *dev)
-{
-	struct sandbox_reset_test *sbrt = dev_get_priv(dev);
-
-	return reset_free(&sbrt->ctl);
-}
-
 int sandbox_reset_test_release_bulk(struct udevice *dev)
 {
 	struct sandbox_reset_test *sbrt = dev_get_priv(dev);

index 8dc0023..289693d 100644
@@ -35,8 +35,6 @@ static int dm_test_reset(struct unit_test_state *uts)
 	ut_assertok(sandbox_reset_test_deassert(dev_test));
 	ut_asserteq(0, sandbox_reset_query(dev_reset, TEST_RESET_ID));
 
-	ut_assertok(sandbox_reset_test_free(dev_test));
-
 	return 0;
 }
 DM_TEST(dm_test_reset, DM_TESTF_SCAN_FDT);

index 9a5c9c9..24dd48c 100644
@@ -72,12 +72,6 @@ int reset_get_by_index(struct udevice *dev, int index,
 		return ret;
 	}
 
-	ret = ops->request(reset_ctl);
-	if (ret) {
-		debug("ops->request() failed: %d\n", ret);
-		return ret;
-	}
-
 	return 0;
 }
 

@@ -133,24 +127,6 @@ int reset_get_by_name(struct udevice *dev, const char *name,
 	return reset_get_by_index(dev, index, reset_ctl);
 }
 
-int reset_request(struct reset_ctl *reset_ctl)
-{
-	struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
-
-	debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
-
-	return ops->request(reset_ctl);
-}
-
-int reset_free(struct reset_ctl *reset_ctl)
-{
-	struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
-
-	debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
-
-	return ops->free(reset_ctl);
-}
-
 int reset_assert(struct reset_ctl *reset_ctl)
 {
 	struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);

@@ -209,10 +185,6 @@ int reset_release_all(struct reset_ctl *reset_ctl, int count)
 		ret = reset_assert(&reset_ctl[i]);
 		if (ret)
 			return ret;
-
-		ret = reset_free(&reset_ctl[i]);
-		if (ret)
-			return ret;
 	}
 
 	return 0;

index 50fbeb1..a6301cf 100644
@@ -40,27 +40,6 @@ struct reset_ops {
 	int (*of_xlate)(struct reset_ctl *reset_ctl,
 			struct ofnode_phandle_args *args);
 	/**
-	 * request - Request a translated reset control.
-	 *
-	 * The reset core calls this function as the second step in
-	 * implementing a client's reset_get_by_*() call, following a
-	 * successful xxx_xlate() call.
-	 *
-	 * @reset_ctl:	The reset control struct to request; this has been
-	 *		filled in by a previoux xxx_xlate() function call.
-	 * @return 0 if OK, or a negative error code.
-	 */
-	int (*request)(struct reset_ctl *reset_ctl);
-	/**
-	 * free - Free a previously requested reset control.
-	 *
-	 * This is the implementation of the client reset_free() API.
-	 *
-	 * @reset_ctl:	The reset control to free.
-	 * @return 0 if OK, or a negative error code.
-	 */
-	int (*free)(struct reset_ctl *reset_ctl);
-	/**
 	 * rst_assert - Assert a reset signal.
 	 *
 	 * Note: This function is named rst_assert not assert to avoid

index d38f176..505de77 100644
@@ -134,24 +134,6 @@ int reset_get_by_name(struct udevice *dev, const char *name,
 		      struct reset_ctl *reset_ctl);
 
 /**
- * reset_request - Request a reset signal.
- *
- * @reset_ctl:	A reset control struct.
- *
- * @return 0 if OK, or a negative error code.
- */
-int reset_request(struct reset_ctl *reset_ctl);
-
-/**
- * reset_free - Free a previously requested reset signal.
- *
- * @reset_ctl:	A reset control struct that was previously successfully
- *		requested by reset_get_by_*().
- * @return 0 if OK, or a negative error code.
- */
-int reset_free(struct reset_ctl *reset_ctl);
-
-/**
  * reset_assert - Assert a reset signal.
  *
  * This function will assert the specified reset signal, thus resetting the

@@ -254,11 +236,6 @@ static inline int reset_get_by_name(struct udevice *dev, const char *name,
 	return -ENOTSUPP;
 }
 
-static inline int reset_free(struct reset_ctl *reset_ctl)
-{
-	return 0;
-}
-
 static inline int reset_assert(struct reset_ctl *reset_ctl)
 {
 	return 0;