reset: Return 0 if ops unimplemented and remove empty functions

In case the ops is not implemented, return 0 in the core right away.
This is better than having multiple copies of functions which just
return 0 in each reset driver. Drop all those empty functions.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>

diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c
index c3d650fc6b0848a961e3b44843ab98b15cbda5da..0a1dd236aff3c2e5559936955d9d54afd05b50da 100644 (file)
--- a/drivers/reset/reset-ast2500.c
+++ b/drivers/reset/reset-ast2500.c
@@ -18,22 +18,6 @@ struct ast2500_reset_priv {
        struct ast2500_scu *scu;
 };
 
-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_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 ast2500_reset_assert(struct reset_ctl *reset_ctl)
 {
        struct ast2500_reset_priv *priv = dev_get_priv(reset_ctl->dev);
@@ -93,8 +77,6 @@ static const struct udevice_id ast2500_reset_ids[] = {
 };
 
 struct reset_ops ast2500_reset_ops = {
-       .request = ast2500_reset_request,
-       .rfree = ast2500_reset_free,
        .rst_assert = ast2500_reset_assert,
        .rst_deassert = ast2500_reset_deassert,
 };

diff --git a/drivers/reset/reset-ast2600.c b/drivers/reset/reset-ast2600.c
index 195ddd18e05b4d1a8590b56f7df27918ac69252e..985235a3ac461f8394246c152de5b15be0f65b26 100644 (file)
--- a/drivers/reset/reset-ast2600.c
+++ b/drivers/reset/reset-ast2600.c
@@ -17,22 +17,6 @@ struct ast2600_reset_priv {
        struct ast2600_scu *scu;
 };
 
-static int ast2600_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 ast2600_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 ast2600_reset_assert(struct reset_ctl *reset_ctl)
 {
        struct ast2600_reset_priv *priv = dev_get_priv(reset_ctl->dev);
@@ -92,8 +76,6 @@ static const struct udevice_id ast2600_reset_ids[] = {
 };
 
 struct reset_ops ast2600_reset_ops = {
-       .request = ast2600_reset_request,
-       .rfree = ast2600_reset_free,
        .rst_assert = ast2600_reset_assert,
        .rst_deassert = ast2600_reset_deassert,
 };

diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index f69189822bf7fe9556b8ff7e66057ec2ba7460f1..5383f59ca375f6176585857c2912fdfdbc2e4da8 100644 (file)
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -42,11 +42,6 @@ static int bcm6345_reset_deassert(struct reset_ctl *rst)
        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)
@@ -56,7 +51,6 @@ static int bcm6345_reset_request(struct reset_ctl *rst)
 }
 
 struct reset_ops bcm6345_reset_reset_ops = {
-       .rfree = bcm6345_reset_free,
        .request = bcm6345_reset_request,
        .rst_assert = bcm6345_reset_assert,
        .rst_deassert = bcm6345_reset_deassert,

diff --git a/drivers/reset/reset-dra7.c b/drivers/reset/reset-dra7.c
index 585f8323c52e3a5b12c52ebcc85aeccea8e424fc..a9589d448dca30f8b15fa98985fbf5b108f02c16 100644 (file)
--- a/drivers/reset/reset-dra7.c
+++ b/drivers/reset/reset-dra7.c
@@ -18,16 +18,6 @@ struct dra7_reset_priv {
        u8 nreset;
 };
 
-static int dra7_reset_request(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
-static int dra7_reset_free(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
 static inline void dra7_reset_rmw(u32 addr, u32 value, u32 mask)
 {
        writel(((readl(addr) & (~mask)) | (value & mask)), addr);
@@ -63,8 +53,6 @@ static int dra7_reset_assert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops dra7_reset_ops = {
-       .request = dra7_reset_request,
-       .rfree = dra7_reset_free,
        .rst_assert = dra7_reset_assert,
        .rst_deassert = dra7_reset_deassert,
 };

diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 3f9da8cc8d318bc03f2c3226b67db57f1afe0cbd..8152cec22714f4a03ff9f3cb8cb523d66902abad 100644 (file)
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -46,16 +46,6 @@ static int hisi_reset_assert(struct reset_ctl *rst)
        return 0;
 }
 
-static int hisi_reset_free(struct reset_ctl *rst)
-{
-       return 0;
-}
-
-static int hisi_reset_request(struct reset_ctl *rst)
-{
-       return 0;
-}
-
 static int hisi_reset_of_xlate(struct reset_ctl *rst,
                               struct ofnode_phandle_args *args)
 {
@@ -74,8 +64,6 @@ static int hisi_reset_of_xlate(struct reset_ctl *rst,
 
 static const struct reset_ops hisi_reset_reset_ops = {
        .of_xlate = hisi_reset_of_xlate,
-       .request = hisi_reset_request,
-       .rfree = hisi_reset_free,
        .rst_assert = hisi_reset_assert,
        .rst_deassert = hisi_reset_deassert,
 };

diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 8318d0a20b4a92763d1919365f4bee08288fba80..74b1173e8878b26e2730b89effdb4569d79562e5 100644 (file)
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -76,15 +76,7 @@ static int hsdk_reset_reset(struct reset_ctl *rst_ctl)
        return hsdk_reset_do(rst);
 }
 
-static int hsdk_reset_noop(struct reset_ctl *rst_ctl)
-{
-       return 0;
-}
-
 static const struct reset_ops hsdk_reset_ops = {
-       .request        = hsdk_reset_noop,
-       .rfree          = hsdk_reset_noop,
-       .rst_assert     = hsdk_reset_noop,
        .rst_deassert   = hsdk_reset_reset,
 };
 

diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index e5085ae17c43a9150046d85614c34d4285b33be9..eaef2cc2cdf40b800bd797c885362e4156d95b52 100644 (file)
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -264,19 +264,7 @@ static int imx7_reset_deassert(struct reset_ctl *rst)
        return priv->ops.rst_deassert(rst);
 }
 
-static int imx7_reset_free(struct reset_ctl *rst)
-{
-       return 0;
-}
-
-static int imx7_reset_request(struct reset_ctl *rst)
-{
-       return 0;
-}
-
 static const struct reset_ops imx7_reset_reset_ops = {
-       .request = imx7_reset_request,
-       .rfree = imx7_reset_free,
        .rst_assert = imx7_reset_assert,
        .rst_deassert = imx7_reset_deassert,
 };

diff --git a/drivers/reset/reset-ipq4019.c b/drivers/reset/reset-ipq4019.c
index 15858f3cb1ee5117db312e17ff71168ea9dea883..7f0bd85ad686d229a4c366cb476b632d1b4fc2c9 100644 (file)
--- a/drivers/reset/reset-ipq4019.c
+++ b/drivers/reset/reset-ipq4019.c
@@ -130,19 +130,7 @@ static int ipq4019_reset_deassert(struct reset_ctl *rst)
        return 0;
 }
 
-static int ipq4019_reset_free(struct reset_ctl *rst)
-{
-       return 0;
-}
-
-static int ipq4019_reset_request(struct reset_ctl *rst)
-{
-       return 0;
-}
-
 static const struct reset_ops ipq4019_reset_ops = {
-       .request = ipq4019_reset_request,
-       .rfree = ipq4019_reset_free,
        .rst_assert = ipq4019_reset_assert,
        .rst_deassert = ipq4019_reset_deassert,
 };

diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 7427013ab60613dc3bcf7943a7a3395242142f24..8b62d917778bc7cd5137f63f04afd56421006f06 100644 (file)
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -24,16 +24,6 @@ struct mediatek_reset_priv {
        u32 nr_resets;
 };
 
-static int mediatek_reset_request(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
-static int mediatek_reset_free(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
 static int mediatek_reset_assert(struct reset_ctl *reset_ctl)
 {
        struct mediatek_reset_priv *priv = dev_get_priv(reset_ctl->dev);
@@ -59,8 +49,6 @@ static int mediatek_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops mediatek_reset_ops = {
-       .request = mediatek_reset_request,
-       .rfree = mediatek_reset_free,
        .rst_assert = mediatek_reset_assert,
        .rst_deassert = mediatek_reset_deassert,
 };

diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 5896bcb421813198fe9fee55326b6a61eb72918b..64bc696f137278756220b5b90c10e3660ab5b073 100644 (file)
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -30,11 +30,6 @@ static int meson_reset_request(struct reset_ctl *reset_ctl)
        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);
@@ -65,7 +60,6 @@ static int meson_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops meson_reset_ops = {
        .request = meson_reset_request,
-       .rfree = meson_reset_free,
        .rst_assert = meson_reset_assert,
        .rst_deassert = meson_reset_deassert,
 };

diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index 4e71d5255845c1b50d5c2dbb2cca5dc679df13fa..7bb8469823c88c898889403366330942839bfae6 100644 (file)
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -18,16 +18,6 @@ struct mtmips_reset_priv {
        void __iomem *base;
 };
 
-static int mtmips_reset_request(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
-static int mtmips_reset_free(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
 static int mtmips_reset_assert(struct reset_ctl *reset_ctl)
 {
        struct mtmips_reset_priv *priv = dev_get_priv(reset_ctl->dev);
@@ -47,8 +37,6 @@ static int mtmips_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 static const struct reset_ops mtmips_reset_ops = {
-       .request        = mtmips_reset_request,
-       .rfree          = mtmips_reset_free,
        .rst_assert     = mtmips_reset_assert,
        .rst_deassert   = mtmips_reset_deassert,
 };

diff --git a/drivers/reset/reset-raspberrypi.c b/drivers/reset/reset-raspberrypi.c
index 6a80179b822d93edb629ddd5927b897378ff8690..804e32b8dd140b21b18d1039e1a794984d9763b5 100644 (file)
--- a/drivers/reset/reset-raspberrypi.c
+++ b/drivers/reset/reset-raspberrypi.c
@@ -18,11 +18,6 @@ static int raspberrypi_reset_request(struct reset_ctl *reset_ctl)
        return 0;
 }
 
-static int raspberrypi_reset_free(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
 static int raspberrypi_reset_assert(struct reset_ctl *reset_ctl)
 {
        switch (reset_ctl->id) {
@@ -34,16 +29,9 @@ static int raspberrypi_reset_assert(struct reset_ctl *reset_ctl)
        }
 }
 
-static int raspberrypi_reset_deassert(struct reset_ctl *reset_ctl)
-{
-       return 0;
-}
-
 struct reset_ops raspberrypi_reset_ops = {
        .request = raspberrypi_reset_request,
-       .rfree = raspberrypi_reset_free,
        .rst_assert = raspberrypi_reset_assert,
-       .rst_deassert = raspberrypi_reset_deassert,
 };
 
 static const struct udevice_id raspberrypi_reset_ids[] = {

diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index eeb3d2eea7748fb6456a7f88f58f26d0e3080416..e0a95edd80acf6b8695f312216d366d609345b91 100644 (file)
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -40,14 +40,6 @@ static int rockchip_reset_request(struct reset_ctl *reset_ctl)
        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);
@@ -80,7 +72,6 @@ static int rockchip_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops rockchip_reset_ops = {
        .request = rockchip_reset_request,
-       .rfree = rockchip_reset_free,
        .rst_assert = rockchip_reset_assert,
        .rst_deassert = rockchip_reset_deassert,
 };

diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c
index 850cb188868d8c6beafd1083f9a1a0cdd342d973..81d195a06a9630d0ae293008f8aa571feeb02e41 100644 (file)
--- a/drivers/reset/reset-scmi.c
+++ b/drivers/reset/reset-scmi.c
@@ -65,14 +65,8 @@ static int scmi_reset_request(struct reset_ctl *rst)
        return scmi_to_linux_errno(out.status);
 }
 
-static int scmi_reset_rfree(struct reset_ctl *rst)
-{
-       return 0;
-}
-
 static const struct reset_ops scmi_reset_domain_ops = {
        .request        = scmi_reset_request,
-       .rfree          = scmi_reset_rfree,
        .rst_assert     = scmi_reset_assert,
        .rst_deassert   = scmi_reset_deassert,
 };

diff --git a/drivers/reset/reset-sifive.c b/drivers/reset/reset-sifive.c
index eec840d677fb4142101d3c1ec32ec111cf2c737f..23513b2f541b4b0cbd30198f47a2b949efc24705 100644 (file)
--- a/drivers/reset/reset-sifive.c
+++ b/drivers/reset/reset-sifive.c
@@ -63,16 +63,6 @@ static int sifive_reset_request(struct reset_ctl *rst)
        return 0;
 }
 
-static int sifive_reset_free(struct reset_ctl *rst)
-{
-       struct sifive_reset_priv *priv = dev_get_priv(rst->dev);
-
-       debug("%s(rst=%p) (dev=%p, id=%lu) (nr_reset=%d)\n", __func__,
-             rst, rst->dev, rst->id, priv->nr_reset);
-
-       return 0;
-}
-
 static int sifive_reset_probe(struct udevice *dev)
 {
        struct sifive_reset_priv *priv = dev_get_priv(dev);
@@ -105,7 +95,6 @@ int sifive_reset_bind(struct udevice *dev, ulong count)
 
 const struct reset_ops sifive_reset_ops = {
        .request = sifive_reset_request,
-       .rfree = sifive_reset_free,
        .rst_assert = sifive_reset_assert,
        .rst_deassert = sifive_reset_deassert,
 };

diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 98450db94b2020f9481eb89afe2c40a7738eb45d..6e3f03e2484344ccb32073ced94ca55361bfe84f 100644 (file)
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -89,25 +89,7 @@ static int socfpga_reset_deassert(struct reset_ctl *reset_ctl)
                                 false, 500, false);
 }
 
-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,
-       .rfree = socfpga_reset_free,
        .rst_assert = socfpga_reset_assert,
        .rst_deassert = socfpga_reset_deassert,
 };

diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 8b95938dfe35358cee3c0ba7ee5a5538909265ba..e2a9c2a142b1ea7f912b8400660dd9f2bb2e6851 100644 (file)
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -41,13 +41,6 @@ static int sunxi_reset_request(struct reset_ctl *reset_ctl)
        return 0;
 }
 
-static int sunxi_reset_free(struct reset_ctl *reset_ctl)
-{
-       debug("%s: (RST#%ld)\n", __func__, reset_ctl->id);
-
-       return 0;
-}
-
 static int sunxi_set_reset(struct reset_ctl *reset_ctl, bool on)
 {
        struct sunxi_reset_priv *priv = dev_get_priv(reset_ctl->dev);
@@ -85,7 +78,6 @@ static int sunxi_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops sunxi_reset_ops = {
        .request = sunxi_reset_request,
-       .rfree = sunxi_reset_free,
        .rst_assert = sunxi_reset_assert,
        .rst_deassert = sunxi_reset_deassert,
 };

diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index d8510a4abb27291f8c5089aabd0953dfc9e6517b..f35332767b2b2826729efaa96ecc5e75be62e42b 100644 (file)
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -63,18 +63,6 @@ static int ti_sci_reset_of_xlate(struct reset_ctl *rst,
        return 0;
 }
 
-static int ti_sci_reset_request(struct reset_ctl *rst)
-{
-       debug("%s(rst=%p)\n", __func__, rst);
-       return 0;
-}
-
-static int ti_sci_reset_free(struct reset_ctl *rst)
-{
-       debug("%s(rst=%p)\n", __func__, rst);
-       return 0;
-}
-
 /**
  * ti_sci_reset_set() - program a device's reset
  * @rst: Handle to a single reset signal
@@ -193,8 +181,6 @@ static const struct udevice_id ti_sci_reset_of_match[] = {
 
 static struct reset_ops ti_sci_reset_ops = {
        .of_xlate = ti_sci_reset_of_xlate,
-       .request = ti_sci_reset_request,
-       .rfree = ti_sci_reset_free,
        .rst_assert = ti_sci_reset_assert,
        .rst_deassert = ti_sci_reset_deassert,
        .rst_status = ti_sci_reset_status,

diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c
index ca9f00a8f24953f94073b41945040ede554a56ee..bcef46039c215f031ac349a2158842e7f936ee05 100644 (file)
--- a/drivers/reset/reset-uclass.c
+++ b/drivers/reset/reset-uclass.c
@@ -68,7 +68,7 @@ static int reset_get_by_index_tail(int ret, ofnode node,
                return ret;
        }
 
-       ret = ops->request(reset_ctl);
+       ret = ops->request ? ops->request(reset_ctl) : 0;
        if (ret) {
                debug("ops->request() failed: %d\n", ret);
                return ret;
@@ -168,7 +168,7 @@ int reset_request(struct reset_ctl *reset_ctl)
 
        debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
-       return ops->request(reset_ctl);
+       return ops->request ? ops->request(reset_ctl) : 0;
 }
 
 int reset_free(struct reset_ctl *reset_ctl)
@@ -177,7 +177,7 @@ int reset_free(struct reset_ctl *reset_ctl)
 
        debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
-       return ops->rfree(reset_ctl);
+       return ops->rfree ? ops->rfree(reset_ctl) : 0;
 }
 
 int reset_assert(struct reset_ctl *reset_ctl)
@@ -186,7 +186,7 @@ int reset_assert(struct reset_ctl *reset_ctl)
 
        debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
-       return ops->rst_assert(reset_ctl);
+       return ops->rst_assert ? ops->rst_assert(reset_ctl) : 0;
 }
 
 int reset_assert_bulk(struct reset_ctl_bulk *bulk)
@@ -208,7 +208,7 @@ int reset_deassert(struct reset_ctl *reset_ctl)
 
        debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
-       return ops->rst_deassert(reset_ctl);
+       return ops->rst_deassert ? ops->rst_deassert(reset_ctl) : 0;
 }
 
 int reset_deassert_bulk(struct reset_ctl_bulk *bulk)
@@ -230,7 +230,7 @@ int reset_status(struct reset_ctl *reset_ctl)
 
        debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
-       return ops->rst_status(reset_ctl);
+       return ops->rst_status ? ops->rst_status(reset_ctl) : 0;
 }
 
 int reset_release_all(struct reset_ctl *reset_ctl, int count)

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index c5af995b4bd3c87824cc1a7db8a1491012d26df3..7adae51873f356ba0f53852577ce6a41f353a2f0 100644 (file)
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -184,16 +184,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);
@@ -239,8 +229,6 @@ static int uniphier_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 static const struct reset_ops uniphier_reset_ops = {
-       .request = uniphier_reset_request,
-       .rfree = uniphier_reset_free,
        .rst_assert = uniphier_reset_assert,
        .rst_deassert = uniphier_reset_deassert,
 };

diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c
index 57652346738da74c94a476d03af23bd85d213f23..4e3f907980f61d96afb546e5c23998bc74f2baa9 100644 (file)
--- a/drivers/reset/reset-zynqmp.c
+++ b/drivers/reset/reset-zynqmp.c
@@ -59,16 +59,6 @@ static int zynqmp_reset_request(struct reset_ctl *rst)
        return 0;
 }
 
-static int zynqmp_reset_free(struct reset_ctl *rst)
-{
-       struct zynqmp_reset_priv *priv = dev_get_priv(rst->dev);
-
-       dev_dbg(rst->dev, "%s(rst=%p) (id=%lu) (nr_reset=%d)\n", __func__,
-               rst, rst->id, priv->nr_reset);
-
-       return 0;
-}
-
 static int zynqmp_reset_probe(struct udevice *dev)
 {
        struct zynqmp_reset_priv *priv = dev_get_priv(dev);
@@ -80,7 +70,6 @@ static int zynqmp_reset_probe(struct udevice *dev)
 
 const struct reset_ops zynqmp_reset_ops = {
        .request = zynqmp_reset_request,
-       .rfree = zynqmp_reset_free,
        .rst_assert = zynqmp_reset_assert,
        .rst_deassert = zynqmp_reset_deassert,
 };

diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 9287f28952cffa83e03c1eff71de495903173fda..ea449bbaaf078aaaac9c5e561c94a431ae908b5a 100644 (file)
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -280,16 +280,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);
@@ -301,8 +291,6 @@ static int sti_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops sti_reset_ops = {
-       .request = sti_reset_request,
-       .rfree = sti_reset_free,
        .rst_assert = sti_reset_assert,
        .rst_deassert = sti_reset_deassert,
 };

diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index bbc6b135a93f0679711d26558b15a84eaf3a89da..0bbde29810b44f859d6ba6f9c4c4a945df4de2cb 100644 (file)
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -27,16 +27,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);
@@ -80,8 +70,6 @@ static int stm32_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 static const struct reset_ops stm32_reset_ops = {
-       .request        = stm32_reset_request,
-       .rfree          = stm32_reset_free,
        .rst_assert     = stm32_reset_assert,
        .rst_deassert   = stm32_reset_deassert,
 };

diff --git a/drivers/reset/tegra-car-reset.c b/drivers/reset/tegra-car-reset.c
index a33d4533a82b9cc65fae8739e6f66072ccc7cfce..501e9cab8f7c20662d0cdc018628116a80605317 100644 (file)
--- a/drivers/reset/tegra-car-reset.c
+++ b/drivers/reset/tegra-car-reset.c
@@ -23,14 +23,6 @@ static int tegra_car_reset_request(struct reset_ctl *reset_ctl)
        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,
@@ -53,21 +45,12 @@ static int tegra_car_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops tegra_car_reset_ops = {
        .request = tegra_car_reset_request,
-       .rfree = tegra_car_reset_free,
        .rst_assert = tegra_car_reset_assert,
        .rst_deassert = tegra_car_reset_deassert,
 };
 
-static int tegra_car_reset_probe(struct udevice *dev)
-{
-       debug("%s(dev=%p)\n", __func__, dev);
-
-       return 0;
-}
-
 U_BOOT_DRIVER(tegra_car_reset) = {
        .name = "tegra_car_reset",
        .id = UCLASS_RESET,
-       .probe = tegra_car_reset_probe,
        .ops = &tegra_car_reset_ops,
 };

diff --git a/drivers/reset/tegra186-reset.c b/drivers/reset/tegra186-reset.c
index c60a03f0bfa3daab341d012a2f2f1bdf8a5a3f0f..d43da454114ded3f3debfb78c5eea0fee0b5780a 100644 (file)
--- a/drivers/reset/tegra186-reset.c
+++ b/drivers/reset/tegra186-reset.c
@@ -11,22 +11,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)
 {
@@ -61,22 +45,12 @@ static int tegra186_reset_deassert(struct reset_ctl *reset_ctl)
 }
 
 struct reset_ops tegra186_reset_ops = {
-       .request = tegra186_reset_request,
-       .rfree = tegra186_reset_free,
        .rst_assert = tegra186_reset_assert,
        .rst_deassert = tegra186_reset_deassert,
 };
 
-static int tegra186_reset_probe(struct udevice *dev)
-{
-       debug("%s(dev=%p)\n", __func__, dev);
-
-       return 0;
-}
-
 U_BOOT_DRIVER(tegra186_reset) = {
        .name           = "tegra186_reset",
        .id             = UCLASS_RESET,
-       .probe          = tegra186_reset_probe,
        .ops = &tegra186_reset_ops,
 };