Skip to content

Commit 3338fe5

Browse files
committed
Merge tag 'renesas-clk-for-v5.13-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas
Pull Renesas clk driver updates from Geert Uytterhoeven: - Spelling fixes - Zero init clk_init_data * tag 'renesas-clk-for-v5.13-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: Zero init clk_init_data clk: renesas: Couple of spelling fixes
2 parents 60c325a + f2fb4fe commit 3338fe5

File tree

8 files changed

+13
-18
lines changed

8 files changed

+13
-18
lines changed

drivers/clk/renesas/clk-div6.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ struct clk * __init cpg_div6_register(const char *name,
216216
struct raw_notifier_head *notifiers)
217217
{
218218
unsigned int valid_parents;
219-
struct clk_init_data init;
219+
struct clk_init_data init = {};
220220
struct div6_clock *clock;
221221
struct clk *clk;
222222
unsigned int i;
@@ -267,7 +267,6 @@ struct clk * __init cpg_div6_register(const char *name,
267267
/* Register the clock. */
268268
init.name = name;
269269
init.ops = &cpg_div6_clock_ops;
270-
init.flags = 0;
271270
init.parent_names = parent_names;
272271
init.num_parents = valid_parents;
273272

drivers/clk/renesas/clk-mstp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static struct clk * __init cpg_mstp_clock_register(const char *name,
150150
const char *parent_name, unsigned int index,
151151
struct mstp_clock_group *group)
152152
{
153-
struct clk_init_data init;
153+
struct clk_init_data init = {};
154154
struct mstp_clock *clock;
155155
struct clk *clk;
156156

drivers/clk/renesas/r9a06g032-clocks.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = {
279279
/*
280280
* These are not hardware clocks, but are needed to handle the special
281281
* case where we have a 'selector bit' that doesn't just change the
282-
* parent for a clock, but also the gate it's suposed to use.
282+
* parent for a clock, but also the gate it's supposed to use.
283283
*/
284284
{
285285
.index = R9A06G032_UART_GROUP_012,
@@ -311,7 +311,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = {
311311

312312
struct r9a06g032_priv {
313313
struct clk_onecell_data data;
314-
spinlock_t lock; /* protects concurent access to gates */
314+
spinlock_t lock; /* protects concurrent access to gates */
315315
void __iomem *reg;
316316
};
317317

@@ -504,7 +504,7 @@ r9a06g032_register_gate(struct r9a06g032_priv *clocks,
504504
{
505505
struct clk *clk;
506506
struct r9a06g032_clk_gate *g;
507-
struct clk_init_data init;
507+
struct clk_init_data init = {};
508508

509509
g = kzalloc(sizeof(*g), GFP_KERNEL);
510510
if (!g)
@@ -674,7 +674,7 @@ r9a06g032_register_div(struct r9a06g032_priv *clocks,
674674
{
675675
struct r9a06g032_clk_div *div;
676676
struct clk *clk;
677-
struct clk_init_data init;
677+
struct clk_init_data init = {};
678678
unsigned int i;
679679

680680
div = kzalloc(sizeof(*div), GFP_KERNEL);
@@ -758,7 +758,7 @@ r9a06g032_register_bitsel(struct r9a06g032_priv *clocks,
758758
{
759759
struct clk *clk;
760760
struct r9a06g032_clk_bitsel *g;
761-
struct clk_init_data init;
761+
struct clk_init_data init = {};
762762
const char *names[2];
763763

764764
/* allocate the gate */
@@ -849,7 +849,7 @@ r9a06g032_register_dualgate(struct r9a06g032_priv *clocks,
849849
{
850850
struct r9a06g032_clk_dualgate *g;
851851
struct clk *clk;
852-
struct clk_init_data init;
852+
struct clk_init_data init = {};
853853

854854
/* allocate the gate */
855855
g = kzalloc(sizeof(*g), GFP_KERNEL);

drivers/clk/renesas/rcar-cpg-lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ struct clk * __init cpg_sd_clk_register(const char *name,
226226
void __iomem *base, unsigned int offset, const char *parent_name,
227227
struct raw_notifier_head *notifiers, bool skip_first)
228228
{
229-
struct clk_init_data init;
229+
struct clk_init_data init = {};
230230
struct sd_clock *clock;
231231
struct clk *clk;
232232
u32 val;

drivers/clk/renesas/rcar-gen2-cpg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static struct clk * __init cpg_z_clk_register(const char *name,
137137
const char *parent_name,
138138
void __iomem *base)
139139
{
140-
struct clk_init_data init;
140+
struct clk_init_data init = {};
141141
struct cpg_z_clk *zclk;
142142
struct clk *clk;
143143

@@ -147,7 +147,6 @@ static struct clk * __init cpg_z_clk_register(const char *name,
147147

148148
init.name = name;
149149
init.ops = &cpg_z_clk_ops;
150-
init.flags = 0;
151150
init.parent_names = &parent_name;
152151
init.num_parents = 1;
153152

drivers/clk/renesas/rcar-gen3-cpg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static struct clk * __init cpg_z_clk_register(const char *name,
143143
unsigned int div,
144144
unsigned int offset)
145145
{
146-
struct clk_init_data init;
146+
struct clk_init_data init = {};
147147
struct cpg_z_clk *zclk;
148148
struct clk *clk;
149149

drivers/clk/renesas/rcar-usb2-clock-sel.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
144144
struct device_node *np = dev->of_node;
145145
struct usb2_clock_sel_priv *priv;
146146
struct clk *clk;
147-
struct clk_init_data init;
147+
struct clk_init_data init = {};
148148
int ret;
149149

150150
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -188,9 +188,6 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
188188

189189
init.name = "rcar_usb2_clock_sel";
190190
init.ops = &usb2_clock_sel_clock_ops;
191-
init.flags = 0;
192-
init.parent_names = NULL;
193-
init.num_parents = 0;
194191
priv->hw.init = &init;
195192

196193
clk = clk_register(NULL, &priv->hw);

drivers/clk/renesas/renesas-cpg-mssr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
408408
struct mstp_clock *clock = NULL;
409409
struct device *dev = priv->dev;
410410
unsigned int id = mod->id;
411-
struct clk_init_data init;
411+
struct clk_init_data init = {};
412412
struct clk *parent, *clk;
413413
const char *parent_name;
414414
unsigned int i;

0 commit comments

Comments
 (0)