Message ID | 20240716091151.1434450-1-nichen@iscas.ac.cn (mailing list archive) |
---|---|
State | Accepted |
Commit | dc58d15ae7f247f642ea4751a276914eefa31865 |
Headers | show |
Series | spi: meson-spicc: convert comma to semicolon | expand |
On 16/07/2024 11:11, Chen Ni wrote: > Replace a comma between expression statements by a semicolon. > > Fixes: 3e0cf4d3fc29 ("spi: meson-spicc: add a linear clock divider support") > Signed-off-by: Chen Ni <nichen@iscas.ac.cn> > --- > drivers/spi/spi-meson-spicc.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c > index 8838a98b04c2..1d05590a7434 100644 > --- a/drivers/spi/spi-meson-spicc.c > +++ b/drivers/spi/spi-meson-spicc.c > @@ -655,8 +655,8 @@ static int meson_spicc_pow2_clk_init(struct meson_spicc_device *spicc) > } > init.num_parents = 1; > > - pow2_fixed_div->mult = 1, > - pow2_fixed_div->div = 4, > + pow2_fixed_div->mult = 1; > + pow2_fixed_div->div = 4; > pow2_fixed_div->hw.init = &init; > > clk = devm_clk_register(dev, &pow2_fixed_div->hw); > @@ -674,9 +674,9 @@ static int meson_spicc_pow2_clk_init(struct meson_spicc_device *spicc) > parent_data[0].hw = &pow2_fixed_div->hw; > init.num_parents = 1; > > - spicc->pow2_div.shift = 16, > - spicc->pow2_div.width = 3, > - spicc->pow2_div.flags = CLK_DIVIDER_POWER_OF_TWO, > + spicc->pow2_div.shift = 16; > + spicc->pow2_div.width = 3; > + spicc->pow2_div.flags = CLK_DIVIDER_POWER_OF_TWO; > spicc->pow2_div.reg = spicc->base + SPICC_CONREG; > spicc->pow2_div.hw.init = &init; > > @@ -721,8 +721,8 @@ static int meson_spicc_enh_clk_init(struct meson_spicc_device *spicc) > } > init.num_parents = 1; > > - enh_fixed_div->mult = 1, > - enh_fixed_div->div = 2, > + enh_fixed_div->mult = 1; > + enh_fixed_div->div = 2; > enh_fixed_div->hw.init = &init; > > clk = devm_clk_register(dev, &enh_fixed_div->hw); > @@ -740,8 +740,8 @@ static int meson_spicc_enh_clk_init(struct meson_spicc_device *spicc) > parent_data[0].hw = &enh_fixed_div->hw; > init.num_parents = 1; > > - enh_div->shift = 16, > - enh_div->width = 8, > + enh_div->shift = 16; > + enh_div->width = 8; > enh_div->reg = spicc->base + SPICC_ENH_CTL0; > enh_div->hw.init = &init; > > @@ -761,8 +761,8 @@ static int meson_spicc_enh_clk_init(struct meson_spicc_device *spicc) > init.num_parents = 2; > init.flags = CLK_SET_RATE_PARENT; > > - mux->mask = 0x1, > - mux->shift = 24, > + mux->mask = 0x1; > + mux->shift = 24; > mux->reg = spicc->base + SPICC_ENH_CTL0; > mux->hw.init = &init; > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On Tue, 16 Jul 2024 17:11:51 +0800, Chen Ni wrote: > Replace a comma between expression statements by a semicolon. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: meson-spicc: convert comma to semicolon commit: dc58d15ae7f247f642ea4751a276914eefa31865 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index 8838a98b04c2..1d05590a7434 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -655,8 +655,8 @@ static int meson_spicc_pow2_clk_init(struct meson_spicc_device *spicc) } init.num_parents = 1; - pow2_fixed_div->mult = 1, - pow2_fixed_div->div = 4, + pow2_fixed_div->mult = 1; + pow2_fixed_div->div = 4; pow2_fixed_div->hw.init = &init; clk = devm_clk_register(dev, &pow2_fixed_div->hw); @@ -674,9 +674,9 @@ static int meson_spicc_pow2_clk_init(struct meson_spicc_device *spicc) parent_data[0].hw = &pow2_fixed_div->hw; init.num_parents = 1; - spicc->pow2_div.shift = 16, - spicc->pow2_div.width = 3, - spicc->pow2_div.flags = CLK_DIVIDER_POWER_OF_TWO, + spicc->pow2_div.shift = 16; + spicc->pow2_div.width = 3; + spicc->pow2_div.flags = CLK_DIVIDER_POWER_OF_TWO; spicc->pow2_div.reg = spicc->base + SPICC_CONREG; spicc->pow2_div.hw.init = &init; @@ -721,8 +721,8 @@ static int meson_spicc_enh_clk_init(struct meson_spicc_device *spicc) } init.num_parents = 1; - enh_fixed_div->mult = 1, - enh_fixed_div->div = 2, + enh_fixed_div->mult = 1; + enh_fixed_div->div = 2; enh_fixed_div->hw.init = &init; clk = devm_clk_register(dev, &enh_fixed_div->hw); @@ -740,8 +740,8 @@ static int meson_spicc_enh_clk_init(struct meson_spicc_device *spicc) parent_data[0].hw = &enh_fixed_div->hw; init.num_parents = 1; - enh_div->shift = 16, - enh_div->width = 8, + enh_div->shift = 16; + enh_div->width = 8; enh_div->reg = spicc->base + SPICC_ENH_CTL0; enh_div->hw.init = &init; @@ -761,8 +761,8 @@ static int meson_spicc_enh_clk_init(struct meson_spicc_device *spicc) init.num_parents = 2; init.flags = CLK_SET_RATE_PARENT; - mux->mask = 0x1, - mux->shift = 24, + mux->mask = 0x1; + mux->shift = 24; mux->reg = spicc->base + SPICC_ENH_CTL0; mux->hw.init = &init;
Replace a comma between expression statements by a semicolon. Fixes: 3e0cf4d3fc29 ("spi: meson-spicc: add a linear clock divider support") Signed-off-by: Chen Ni <nichen@iscas.ac.cn> --- drivers/spi/spi-meson-spicc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)