lkml.org 
[lkml]   [2019]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 34/46] ARM: pxa: remove get_clk_frequency_khz()
    Date
    get_clk_frequency_khz() is not a proper name for a global function,
    and there is only one caller.

    Convert viper to use the properly namespaced
    pxa25x_get_clk_frequency_khz() and remove the other references.

    Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
    Cc: Viresh Kumar <viresh.kumar@linaro.org>
    Cc: linux-pm@vger.kernel.org
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/mach-pxa/generic.c | 15 ---------------
    arch/arm/mach-pxa/generic.h | 1 -
    arch/arm/mach-pxa/viper.c | 2 +-
    drivers/cpufreq/pxa2xx-cpufreq.c | 2 --
    4 files changed, 1 insertion(+), 19 deletions(-)

    diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
    index fe1d55d328e5..2c2c82fcf9cb 100644
    --- a/arch/arm/mach-pxa/generic.c
    +++ b/arch/arm/mach-pxa/generic.c
    @@ -55,21 +55,6 @@ void __init pxa_timer_init(void)
    pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000));
    }

    -/*
    - * Get the clock frequency as reflected by CCCR and the turbo flag.
    - * We assume these values have been applied via a fcs.
    - * If info is not 0 we also display the current settings.
    - */
    -unsigned int get_clk_frequency_khz(int info)
    -{
    - if (cpu_is_pxa25x())
    - return pxa25x_get_clk_frequency_khz(info);
    - else if (cpu_is_pxa27x())
    - return pxa27x_get_clk_frequency_khz(info);
    - return 0;
    -}
    -EXPORT_SYMBOL(get_clk_frequency_khz);
    -
    void pxa_smemc_set_pcmcia_timing(int sock, u32 mcmem, u32 mcatt, u32 mcio)
    {
    __raw_writel(mcmem, MCMEM(sock));
    diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
    index 67925d3ea026..2f706ef97357 100644
    --- a/arch/arm/mach-pxa/generic.h
    +++ b/arch/arm/mach-pxa/generic.h
    @@ -11,7 +11,6 @@

    struct irq_data;

    -extern unsigned int get_clk_frequency_khz(int info);
    extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *,
    unsigned int));
    extern void __init pxa_map_io(void);
    diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
    index fe74ee266871..e341e26f7e2a 100644
    --- a/arch/arm/mach-pxa/viper.c
    +++ b/arch/arm/mach-pxa/viper.c
    @@ -852,7 +852,7 @@ static void __init viper_init_vcore_gpios(void)
    goto err_dir;

    /* c/should assume redboot set the correct level ??? */
    - viper_set_core_cpu_voltage(get_clk_frequency_khz(0), 1);
    + viper_set_core_cpu_voltage(pxa25x_get_clk_frequency_khz(0), 1);

    return;

    diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c
    index 0f0e676ff781..e74d36d6f78d 100644
    --- a/drivers/cpufreq/pxa2xx-cpufreq.c
    +++ b/drivers/cpufreq/pxa2xx-cpufreq.c
    @@ -107,8 +107,6 @@ static struct pxa_freqs pxa27x_freqs[] = {
    static struct cpufreq_frequency_table
    pxa27x_freq_table[NUM_PXA27x_FREQS+1];

    -extern unsigned get_clk_frequency_khz(int info);
    -
    #ifdef CONFIG_REGULATOR

    static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)
    --
    2.20.0
    \
     
     \ /
      Last update: 2019-10-18 17:44    [W:4.037 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site