Skip to content

Commit 376cf59

Browse files
committed
Merge branch 'at91-4.14-trunk/base_sys-reset' into linux-4.14-at91
2 parents 94885a0 + e0e68c3 commit 376cf59

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/power/reset/at91-sama5d2_shdwc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct shdwc_config {
6868
};
6969

7070
struct shdwc {
71-
struct shdwc_config *cfg;
71+
const struct shdwc_config *cfg;
7272
void __iomem *at91_shdwc_base;
7373
};
7474

@@ -260,7 +260,7 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
260260
}
261261

262262
match = of_match_node(at91_shdwc_of_match, pdev->dev.of_node);
263-
at91_shdwc->cfg = (struct shdwc_config *)(match->data);
263+
at91_shdwc->cfg = match->data;
264264

265265
sclk = devm_clk_get(&pdev->dev, NULL);
266266
if (IS_ERR(sclk))

0 commit comments

Comments
 (0)