Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: amlogic: meson-ee-pwrc: Rename "get_power" to "is_powered_off"

The name "get_power" is used within the Meson EE power controller driver
to indicate whether a power domain is turned on or off. With the
original "get_power" naming the result was:
- true = powered off
- false = powered on

Rename "get_power" to "is_powered_off" to make the naming consistent
with the third argument to pm_genpd_init. Also this naming is easier to
understand when reading the code without looking at the implementation
of "get_power".

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20210517202115.1004065-1-martin.blumenstingl@googlemail.com
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

authored by

Martin Blumenstingl and committed by
Neil Armstrong
e93e6bef 6efb943b

+23 -23
+23 -23
drivers/soc/amlogic/meson-ee-pwrc.c
··· 68 68 struct meson_ee_pwrc_top_domain *top_pd; 69 69 unsigned int mem_pd_count; 70 70 struct meson_ee_pwrc_mem_domain *mem_pd; 71 - bool (*get_power)(struct meson_ee_pwrc_domain *pwrc_domain); 71 + bool (*is_powered_off)(struct meson_ee_pwrc_domain *pwrc_domain); 72 72 }; 73 73 74 74 struct meson_ee_pwrc_domain_data { ··· 217 217 { HHI_AUDIO_MEM_PD_REG0, GENMASK(27, 26) }, 218 218 }; 219 219 220 - #define VPU_PD(__name, __top_pd, __mem, __get_power, __resets, __clks) \ 220 + #define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \ 221 221 { \ 222 222 .name = __name, \ 223 223 .reset_names_count = __resets, \ ··· 225 225 .top_pd = __top_pd, \ 226 226 .mem_pd_count = ARRAY_SIZE(__mem), \ 227 227 .mem_pd = __mem, \ 228 - .get_power = __get_power, \ 228 + .is_powered_off = __is_pwr_off, \ 229 229 } 230 230 231 - #define TOP_PD(__name, __top_pd, __mem, __get_power) \ 231 + #define TOP_PD(__name, __top_pd, __mem, __is_pwr_off) \ 232 232 { \ 233 233 .name = __name, \ 234 234 .top_pd = __top_pd, \ 235 235 .mem_pd_count = ARRAY_SIZE(__mem), \ 236 236 .mem_pd = __mem, \ 237 - .get_power = __get_power, \ 237 + .is_powered_off = __is_pwr_off, \ 238 238 } 239 239 240 240 #define MEM_PD(__name, __mem) \ 241 241 TOP_PD(__name, NULL, __mem, NULL) 242 242 243 - static bool pwrc_ee_get_power(struct meson_ee_pwrc_domain *pwrc_domain); 243 + static bool pwrc_ee_is_powered_off(struct meson_ee_pwrc_domain *pwrc_domain); 244 244 245 245 static struct meson_ee_pwrc_domain_desc axg_pwrc_domains[] = { 246 246 [PWRC_AXG_VPU_ID] = VPU_PD("VPU", &gx_pwrc_vpu, axg_pwrc_mem_vpu, 247 - pwrc_ee_get_power, 5, 2), 247 + pwrc_ee_is_powered_off, 5, 2), 248 248 [PWRC_AXG_ETHERNET_MEM_ID] = MEM_PD("ETH", meson_pwrc_mem_eth), 249 249 [PWRC_AXG_AUDIO_ID] = MEM_PD("AUDIO", axg_pwrc_mem_audio), 250 250 }; 251 251 252 252 static struct meson_ee_pwrc_domain_desc g12a_pwrc_domains[] = { 253 253 [PWRC_G12A_VPU_ID] = VPU_PD("VPU", &gx_pwrc_vpu, g12a_pwrc_mem_vpu, 254 - pwrc_ee_get_power, 11, 2), 254 + pwrc_ee_is_powered_off, 11, 2), 255 255 [PWRC_G12A_ETH_ID] = MEM_PD("ETH", meson_pwrc_mem_eth), 256 256 }; 257 257 258 258 static struct meson_ee_pwrc_domain_desc gxbb_pwrc_domains[] = { 259 259 [PWRC_GXBB_VPU_ID] = VPU_PD("VPU", &gx_pwrc_vpu, gxbb_pwrc_mem_vpu, 260 - pwrc_ee_get_power, 12, 2), 260 + pwrc_ee_is_powered_off, 12, 2), 261 261 [PWRC_GXBB_ETHERNET_MEM_ID] = MEM_PD("ETH", meson_pwrc_mem_eth), 262 262 }; 263 263 264 264 static struct meson_ee_pwrc_domain_desc meson8_pwrc_domains[] = { 265 265 [PWRC_MESON8_VPU_ID] = VPU_PD("VPU", &meson8_pwrc_vpu, 266 - meson8_pwrc_mem_vpu, pwrc_ee_get_power, 267 - 0, 1), 266 + meson8_pwrc_mem_vpu, 267 + pwrc_ee_is_powered_off, 0, 1), 268 268 [PWRC_MESON8_ETHERNET_MEM_ID] = MEM_PD("ETHERNET_MEM", 269 269 meson_pwrc_mem_eth), 270 270 [PWRC_MESON8_AUDIO_DSP_MEM_ID] = MEM_PD("AUDIO_DSP_MEM", ··· 273 273 274 274 static struct meson_ee_pwrc_domain_desc meson8b_pwrc_domains[] = { 275 275 [PWRC_MESON8_VPU_ID] = VPU_PD("VPU", &meson8_pwrc_vpu, 276 - meson8_pwrc_mem_vpu, pwrc_ee_get_power, 277 - 11, 1), 276 + meson8_pwrc_mem_vpu, 277 + pwrc_ee_is_powered_off, 11, 1), 278 278 [PWRC_MESON8_ETHERNET_MEM_ID] = MEM_PD("ETHERNET_MEM", 279 279 meson_pwrc_mem_eth), 280 280 [PWRC_MESON8_AUDIO_DSP_MEM_ID] = MEM_PD("AUDIO_DSP_MEM", ··· 283 283 284 284 static struct meson_ee_pwrc_domain_desc sm1_pwrc_domains[] = { 285 285 [PWRC_SM1_VPU_ID] = VPU_PD("VPU", &sm1_pwrc_vpu, sm1_pwrc_mem_vpu, 286 - pwrc_ee_get_power, 11, 2), 286 + pwrc_ee_is_powered_off, 11, 2), 287 287 [PWRC_SM1_NNA_ID] = TOP_PD("NNA", &sm1_pwrc_nna, sm1_pwrc_mem_nna, 288 - pwrc_ee_get_power), 288 + pwrc_ee_is_powered_off), 289 289 [PWRC_SM1_USB_ID] = TOP_PD("USB", &sm1_pwrc_usb, sm1_pwrc_mem_usb, 290 - pwrc_ee_get_power), 290 + pwrc_ee_is_powered_off), 291 291 [PWRC_SM1_PCIE_ID] = TOP_PD("PCI", &sm1_pwrc_pci, sm1_pwrc_mem_pcie, 292 - pwrc_ee_get_power), 292 + pwrc_ee_is_powered_off), 293 293 [PWRC_SM1_GE2D_ID] = TOP_PD("GE2D", &sm1_pwrc_ge2d, sm1_pwrc_mem_ge2d, 294 - pwrc_ee_get_power), 294 + pwrc_ee_is_powered_off), 295 295 [PWRC_SM1_AUDIO_ID] = MEM_PD("AUDIO", sm1_pwrc_mem_audio), 296 296 [PWRC_SM1_ETH_ID] = MEM_PD("ETH", meson_pwrc_mem_eth), 297 297 }; ··· 314 314 struct genpd_onecell_data xlate; 315 315 }; 316 316 317 - static bool pwrc_ee_get_power(struct meson_ee_pwrc_domain *pwrc_domain) 317 + static bool pwrc_ee_is_powered_off(struct meson_ee_pwrc_domain *pwrc_domain) 318 318 { 319 319 u32 reg; 320 320 ··· 445 445 * we need to power the domain off, otherwise the internal clocks 446 446 * prepare/enable counters won't be in sync. 447 447 */ 448 - if (dom->num_clks && dom->desc.get_power && !dom->desc.get_power(dom)) { 448 + if (dom->num_clks && dom->desc.is_powered_off && !dom->desc.is_powered_off(dom)) { 449 449 ret = clk_bulk_prepare_enable(dom->num_clks, dom->clks); 450 450 if (ret) 451 451 return ret; ··· 456 456 return ret; 457 457 } else { 458 458 ret = pm_genpd_init(&dom->base, NULL, 459 - (dom->desc.get_power ? 460 - dom->desc.get_power(dom) : true)); 459 + (dom->desc.is_powered_off ? 460 + dom->desc.is_powered_off(dom) : true)); 461 461 if (ret) 462 462 return ret; 463 463 } ··· 536 536 for (i = 0 ; i < pwrc->xlate.num_domains ; ++i) { 537 537 struct meson_ee_pwrc_domain *dom = &pwrc->domains[i]; 538 538 539 - if (dom->desc.get_power && !dom->desc.get_power(dom)) 539 + if (dom->desc.is_powered_off && !dom->desc.is_powered_off(dom)) 540 540 meson_ee_pwrc_off(&dom->base); 541 541 } 542 542 }