Commit 086bcb50 authored by Rex-BC Chen's avatar Rex-BC Chen Committed by Stephen Boyd
Browse files

clk: mediatek: reset: Refine and reorder functions in reset.c 



To make drivers more readable, we modify the indentation of the drivers
and reorder the location of functions.

Signed-off-by: default avatarRex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20220523093346.28493-4-rex-bc.chen@mediatek.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent edabcf71

drivers/clk/mediatek/reset.c

+36 −32
Original line number Diff line number Diff line
@@ -12,52 +12,55 @@ 


#include "reset.h"



static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,

static int mtk_reset_assert(struct reset_controller_dev *rcdev,

			    unsigned long id)

{

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);

	unsigned int reg = data->regofs + ((id / 32) << 4);



	return regmap_write(data->regmap, reg, BIT(id % 32));

	return regmap_update_bits(data->regmap,

				  data->regofs + ((id / 32) << 2),

				  BIT(id % 32), ~0);

}



static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,

static int mtk_reset_deassert(struct reset_controller_dev *rcdev,

			      unsigned long id)

{

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);

	unsigned int reg = data->regofs + ((id / 32) << 4) + 0x4;



	return regmap_write(data->regmap, reg, BIT(id % 32));

	return regmap_update_bits(data->regmap,

				  data->regofs + ((id / 32) << 2),

				  BIT(id % 32), 0);

}



static int mtk_reset_assert(struct reset_controller_dev *rcdev,

			      unsigned long id)

static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)

{

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);

	int ret;



	return regmap_update_bits(data->regmap, data->regofs + ((id / 32) << 2),

			BIT(id % 32), ~0);

	ret = mtk_reset_assert(rcdev, id);

	if (ret)

		return ret;



	return mtk_reset_deassert(rcdev, id);

}



static int mtk_reset_deassert(struct reset_controller_dev *rcdev,

static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,

				    unsigned long id)

{

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);



	return regmap_update_bits(data->regmap, data->regofs + ((id / 32) << 2),

			BIT(id % 32), 0);

	return regmap_write(data->regmap,

			    data->regofs + ((id / 32) << 4),

			    BIT(id % 32));

}



static int mtk_reset(struct reset_controller_dev *rcdev,

static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,

				      unsigned long id)

{

	int ret;



	ret = mtk_reset_assert(rcdev, id);

	if (ret)

		return ret;

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);



	return mtk_reset_deassert(rcdev, id);

	return regmap_write(data->regmap,

			    data->regofs + ((id / 32) << 4) + 0x4,

			    BIT(id % 32));

}



static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,
@@ -84,7 +87,8 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { 
};



static void mtk_register_reset_controller_common(struct device_node *np,

			unsigned int num_regs, int regofs,

						 unsigned int num_regs,

						 int regofs,

						 const struct reset_control_ops *reset_ops)

{

	struct mtk_reset *data;