Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f99f8b9 authored by Mark Einon's avatar Mark Einon Committed by Ingo Molnar
Browse files

x86/earlyprintk: Put CONFIG_PCI-only functions under the #ifdef 



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)
                     ^

Also convert a few related instances of uintXX_t to kernel specific uXX
defines.

Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stuart.r.anderson@intel.com
Link: http://lkml.kernel.org/r/1427923924-22653-1-git-send-email-mark.einon@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 020b37ac

arch/x86/kernel/early_printk.c

+16 −16
Original line number Diff line number Diff line
@@ -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)

{

	u32 *vaddr = (u32 *)addr;

	/* shift implied by pointer type */

	writel(value, vaddr + offset);

}



static unsigned int mem32_serial_in(unsigned long addr, int offset)

{

	u32 *vaddr = (u32 *)addr;

	/* shift implied by pointer type */

	return readl(vaddr + offset);

}



/*

 * early_pci_serial_init()

 *
@@ -217,8 +217,8 @@ static __init void early_pci_serial_init(char *s) 
	unsigned divisor;

	unsigned long baud = DEFAULT_BAUD;

	u8 bus, slot, func;

	uint32_t classcode, bar0;

	uint16_t cmdreg;

	u32 classcode, bar0;

	u16 cmdreg;

	char *e;