clk: qcom: gcc-sm8150: use ARRAY_SIZE instead of specifying num_parents

Use ARRAY_SIZE() instead of manually specifying num_parents. This makes
adding/removing entries to/from parent_data easy and errorproof.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210405224743.590029-32-dmitry.baryshkov@linaro.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/qcom/gcc-sm8150.c b/drivers/clk/qcom/gcc-sm8150.c
index e642fe7..2457944 100644 (file)
--- a/drivers/clk/qcom/gcc-sm8150.c
+++ b/drivers/clk/qcom/gcc-sm8150.c
@@ -241,7 +241,7 @@ static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_cpuss_ahb_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -264,7 +264,7 @@ static struct clk_rcg2 gcc_emac_ptp_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_emac_ptp_clk_src",
                .parent_data = gcc_parents_5,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_5),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -290,7 +290,7 @@ static struct clk_rcg2 gcc_emac_rgmii_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_emac_rgmii_clk_src",
                .parent_data = gcc_parents_5,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_5),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -314,7 +314,7 @@ static struct clk_rcg2 gcc_gp1_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_gp1_clk_src",
                .parent_data = gcc_parents_1,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_1),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -329,7 +329,7 @@ static struct clk_rcg2 gcc_gp2_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_gp2_clk_src",
                .parent_data = gcc_parents_1,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_1),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -344,7 +344,7 @@ static struct clk_rcg2 gcc_gp3_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_gp3_clk_src",
                .parent_data = gcc_parents_1,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_1),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -365,7 +365,7 @@ static struct clk_rcg2 gcc_pcie_0_aux_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_pcie_0_aux_clk_src",
                .parent_data = gcc_parents_2,
-               .num_parents = 3,
+               .num_parents = ARRAY_SIZE(gcc_parents_2),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -380,7 +380,7 @@ static struct clk_rcg2 gcc_pcie_1_aux_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_pcie_1_aux_clk_src",
                .parent_data = gcc_parents_2,
-               .num_parents = 3,
+               .num_parents = ARRAY_SIZE(gcc_parents_2),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -401,7 +401,7 @@ static struct clk_rcg2 gcc_pcie_phy_refgen_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_pcie_phy_refgen_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -423,7 +423,7 @@ static struct clk_rcg2 gcc_pdm2_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_pdm2_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -446,7 +446,7 @@ static struct clk_rcg2 gcc_qspi_core_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qspi_core_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -480,7 +480,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s0_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s0_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -495,7 +495,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s1_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s1_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -510,7 +510,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s2_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s2_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -525,7 +525,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s3_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s3_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -540,7 +540,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s4_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s4_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -555,7 +555,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s5_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s5_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -570,7 +570,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s6_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s6_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -585,7 +585,7 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s7_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap0_s7_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -600,7 +600,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s0_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap1_s0_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -615,7 +615,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s1_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap1_s1_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -630,7 +630,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s2_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap1_s2_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -645,7 +645,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s3_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap1_s3_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -660,7 +660,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s4_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap1_s4_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -675,7 +675,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s5_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap1_s5_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -690,7 +690,7 @@ static struct clk_rcg2 gcc_qupv3_wrap2_s0_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap2_s0_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -705,7 +705,7 @@ static struct clk_rcg2 gcc_qupv3_wrap2_s1_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap2_s1_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -720,7 +720,7 @@ static struct clk_rcg2 gcc_qupv3_wrap2_s2_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap2_s2_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -735,7 +735,7 @@ static struct clk_rcg2 gcc_qupv3_wrap2_s3_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap2_s3_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -750,7 +750,7 @@ static struct clk_rcg2 gcc_qupv3_wrap2_s4_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap2_s4_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -765,7 +765,7 @@ static struct clk_rcg2 gcc_qupv3_wrap2_s5_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_qupv3_wrap2_s5_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -791,7 +791,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_sdcc2_apps_clk_src",
                .parent_data = gcc_parents_6,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_6),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_floor_ops,
        },
@@ -816,7 +816,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_sdcc4_apps_clk_src",
                .parent_data = gcc_parents_3,
-               .num_parents = 3,
+               .num_parents = ARRAY_SIZE(gcc_parents_3),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_floor_ops,
        },
@@ -836,7 +836,7 @@ static struct clk_rcg2 gcc_tsif_ref_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_tsif_ref_clk_src",
                .parent_data = gcc_parents_7,
-               .num_parents = 5,
+               .num_parents = ARRAY_SIZE(gcc_parents_7),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -860,7 +860,7 @@ static struct clk_rcg2 gcc_ufs_card_axi_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_card_axi_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -883,7 +883,7 @@ static struct clk_rcg2 gcc_ufs_card_ice_core_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_card_ice_core_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -903,7 +903,7 @@ static struct clk_rcg2 gcc_ufs_card_phy_aux_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_card_phy_aux_clk_src",
                .parent_data = gcc_parents_4,
-               .num_parents = 2,
+               .num_parents = ARRAY_SIZE(gcc_parents_4),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -925,7 +925,7 @@ static struct clk_rcg2 gcc_ufs_card_unipro_core_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_card_unipro_core_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -949,7 +949,7 @@ static struct clk_rcg2 gcc_ufs_phy_axi_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_phy_axi_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -964,7 +964,7 @@ static struct clk_rcg2 gcc_ufs_phy_ice_core_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_phy_ice_core_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -979,7 +979,7 @@ static struct clk_rcg2 gcc_ufs_phy_phy_aux_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_phy_phy_aux_clk_src",
                .parent_data = gcc_parents_4,
-               .num_parents = 2,
+               .num_parents = ARRAY_SIZE(gcc_parents_4),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -994,7 +994,7 @@ static struct clk_rcg2 gcc_ufs_phy_unipro_core_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_ufs_phy_unipro_core_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -1018,7 +1018,7 @@ static struct clk_rcg2 gcc_usb30_prim_master_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_usb30_prim_master_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -1040,7 +1040,7 @@ static struct clk_rcg2 gcc_usb30_prim_mock_utmi_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_usb30_prim_mock_utmi_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -1055,7 +1055,7 @@ static struct clk_rcg2 gcc_usb30_sec_master_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_usb30_sec_master_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -1070,7 +1070,7 @@ static struct clk_rcg2 gcc_usb30_sec_mock_utmi_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_usb30_sec_mock_utmi_clk_src",
                .parent_data = gcc_parents_0,
-               .num_parents = 4,
+               .num_parents = ARRAY_SIZE(gcc_parents_0),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -1085,7 +1085,7 @@ static struct clk_rcg2 gcc_usb3_prim_phy_aux_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_usb3_prim_phy_aux_clk_src",
                .parent_data = gcc_parents_2,
-               .num_parents = 3,
+               .num_parents = ARRAY_SIZE(gcc_parents_2),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },
@@ -1100,7 +1100,7 @@ static struct clk_rcg2 gcc_usb3_sec_phy_aux_clk_src = {
        .clkr.hw.init = &(struct clk_init_data){
                .name = "gcc_usb3_sec_phy_aux_clk_src",
                .parent_data = gcc_parents_2,
-               .num_parents = 3,
+               .num_parents = ARRAY_SIZE(gcc_parents_2),
                .flags = CLK_SET_RATE_PARENT,
                .ops = &clk_rcg2_ops,
        },