Skip to content

Commit

Permalink
clk: max77686: Remove unnecessary NULL checking for container_of()
Browse files Browse the repository at this point in the history
container_of() never returns NULL, thus remove the NULL checking for it.
Also rename get_max77686_clk() to to_max77686_clk() for better readability.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
  • Loading branch information
Axel Lin authored and Mike Turquette committed Jan 16, 2013
1 parent bddca89 commit 3fe296c
Showing 1 changed file with 7 additions and 21 deletions.
28 changes: 7 additions & 21 deletions drivers/clk/clk-max77686.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,48 +44,34 @@ struct max77686_clk {
struct clk_lookup *lookup;
};

static struct max77686_clk *get_max77686_clk(struct clk_hw *hw)
static struct max77686_clk *to_max77686_clk(struct clk_hw *hw)
{
return container_of(hw, struct max77686_clk, hw);
}

static int max77686_clk_prepare(struct clk_hw *hw)
{
struct max77686_clk *max77686;
int ret;

max77686 = get_max77686_clk(hw);
if (!max77686)
return -ENOMEM;

ret = regmap_update_bits(max77686->iodev->regmap,
MAX77686_REG_32KHZ, max77686->mask, max77686->mask);
struct max77686_clk *max77686 = to_max77686_clk(hw);

return ret;
return regmap_update_bits(max77686->iodev->regmap,
MAX77686_REG_32KHZ, max77686->mask,
max77686->mask);
}

static void max77686_clk_unprepare(struct clk_hw *hw)
{
struct max77686_clk *max77686;

max77686 = get_max77686_clk(hw);
if (!max77686)
return;
struct max77686_clk *max77686 = to_max77686_clk(hw);

regmap_update_bits(max77686->iodev->regmap,
MAX77686_REG_32KHZ, max77686->mask, ~max77686->mask);
}

static int max77686_clk_is_enabled(struct clk_hw *hw)
{
struct max77686_clk *max77686;
struct max77686_clk *max77686 = to_max77686_clk(hw);
int ret;
u32 val;

max77686 = get_max77686_clk(hw);
if (!max77686)
return -ENOMEM;

ret = regmap_read(max77686->iodev->regmap,
MAX77686_REG_32KHZ, &val);

Expand Down

0 comments on commit 3fe296c

Please sign in to comment.