* Mark Einon <mark.ei...@gmail.com> wrote:
> Two static functions are only used if CONFIG_PCI is defined,so only build them
> if this is the case. Fixes the build warnings:
>
> arch/x86/kernel/early_printk.c:98:13: warning: ‘mem32_serial_out’ defined but
> not used [-Wunused-function]
> static void mem32_serial_out(unsigned long addr, int offset, int value)
> ^
> arch/x86/kernel/early_printk.c:105:21: warning: ‘mem32_serial_in’ defined but
> not used [-Wunused-function]
> static unsigned int mem32_serial_in(unsigned long addr, int offset)
> ^
>
> Signed-off-by: Mark Einon <mark.ei...@gmail.com>
> ---
> v2 - Move code to another #ifdef instead of creating a new ifdef pair after
> comment by Borislav Petkov <b...@alien8.de>.
>
>
> arch/x86/kernel/early_printk.c | 34 ++++++++++++++++++++--------------
> 1 file changed, 20 insertions(+), 14 deletions(-)
>
> diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
> index f85e3fb..cb2bab2 100644
> --- a/arch/x86/kernel/early_printk.c
> +++ b/arch/x86/kernel/early_printk.c
> @@ -95,20 +95,6 @@ static unsigned long early_serial_base = 0x3f8; /* ttyS0
> */
> #define DLL 0 /* Divisor Latch Low */
> #define DLH 1 /* Divisor latch High */
>
> -static void mem32_serial_out(unsigned long addr, int offset, int value)
> -{
> - uint32_t *vaddr = (uint32_t *)addr;
> - /* shift implied by pointer type */
> - writel(value, vaddr + offset);
> -}
> -
> -static unsigned int mem32_serial_in(unsigned long addr, int offset)
> -{
> - uint32_t *vaddr = (uint32_t *)addr;
> - /* shift implied by pointer type */
> - return readl(vaddr + offset);
> -}
> -
> static unsigned int io_serial_in(unsigned long addr, int offset)
> {
> return inb(addr + offset);
> @@ -205,6 +191,20 @@ static __init void early_serial_init(char *s)
> }
>
> #ifdef CONFIG_PCI
> +static void mem32_serial_out(unsigned long addr, int offset, int value)
> +{
> + uint32_t *vaddr = (uint32_t *)addr;
> + /* shift implied by pointer type */
> + writel(value, vaddr + offset);
> +}
> +
> +static unsigned int mem32_serial_in(unsigned long addr, int offset)
> +{
> + uint32_t *vaddr = (uint32_t *)addr;
> + /* shift implied by pointer type */
> + return readl(vaddr + offset);
> +}
btw., while at it, this should use 'u32'.
> +
> /*
> * early_pci_serial_init()
> *
> @@ -375,6 +375,12 @@ static int __init setup_early_printk(char *buf)
> if (!strncmp(buf, "xen", 3))
> early_console_register(&xenboot_console, keep);
> #endif
> +#ifdef CONFIG_EARLY_PRINTK_INTEL_MID
> + if (!strncmp(buf, "hsu", 3)) {
> + hsu_early_console_init(buf + 3);
> + early_console_register(&early_hsu_console, keep);
> + }
> +#endif
> #ifdef CONFIG_EARLY_PRINTK_EFI
> if (!strncmp(buf, "efi", 3))
> early_console_register(&early_efi_console, keep);
huh?
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
