| .. | .. |
|---|
| 419 | 419 | } |
|---|
| 420 | 420 | } |
|---|
| 421 | 421 | |
|---|
| 422 | | -static void mmp_clk_mix_init(struct clk_hw *hw) |
|---|
| 422 | +static int mmp_clk_mix_init(struct clk_hw *hw) |
|---|
| 423 | 423 | { |
|---|
| 424 | 424 | struct mmp_clk_mix *mix = to_clk_mix(hw); |
|---|
| 425 | 425 | |
|---|
| 426 | 426 | if (mix->table) |
|---|
| 427 | 427 | _filter_clk_table(mix, mix->table, mix->table_size); |
|---|
| 428 | + |
|---|
| 429 | + return 0; |
|---|
| 428 | 430 | } |
|---|
| 429 | 431 | |
|---|
| 430 | 432 | const struct clk_ops mmp_clk_mix_ops = { |
|---|
| .. | .. |
|---|
| 439 | 441 | |
|---|
| 440 | 442 | struct clk *mmp_clk_register_mix(struct device *dev, |
|---|
| 441 | 443 | const char *name, |
|---|
| 442 | | - const char **parent_names, |
|---|
| 444 | + const char * const *parent_names, |
|---|
| 443 | 445 | u8 num_parents, |
|---|
| 444 | 446 | unsigned long flags, |
|---|
| 445 | 447 | struct mmp_clk_mix_config *config, |
|---|
| .. | .. |
|---|
| 447 | 449 | { |
|---|
| 448 | 450 | struct mmp_clk_mix *mix; |
|---|
| 449 | 451 | struct clk *clk; |
|---|
| 450 | | - struct clk_init_data init = {}; |
|---|
| 452 | + struct clk_init_data init; |
|---|
| 451 | 453 | size_t table_bytes; |
|---|
| 452 | 454 | |
|---|
| 453 | 455 | mix = kzalloc(sizeof(*mix), GFP_KERNEL); |
|---|