Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 5fdabaab01ee8928597aae8a0178a3a4f7b66365

Authored by Milton Miller
Committed by Paul Mackerras
1 parent 41be31b7d6
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] ppc64: Remove dummy getc routines 

Now that xmon is fixed we should not need the dummy getc routines.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 2 additions and 12 deletions Side-by-side Diff

arch/ppc64/kernel/pmac_setup.c
Diff comments   View file @ 5fdabaa
... ... @@ -274,16 +274,6 @@
274 274 }
275 275  
276 276 #ifdef CONFIG_BOOTX_TEXT
277   -static int dummy_getc_poll(void)
278   -{
279   - return -1;
280   -}
281   -
282   -static unsigned char dummy_getc(void)
283   -{
284   - return 0;
285   -}
286   -
287 277 static void btext_putc(unsigned char c)
288 278 {
289 279 btext_drawchar(c);
... ... @@ -348,8 +338,8 @@
348 338 init_boot_display();
349 339  
350 340 ppc_md.udbg_putc = btext_putc;
351   - ppc_md.udbg_getc = dummy_getc;
352   - ppc_md.udbg_getc_poll = dummy_getc_poll;
  341 + ppc_md.udbg_getc = NULL;
  342 + ppc_md.udbg_getc_poll = NULL;
353 343 #endif /* CONFIG_BOOTX_TEXT */
354 344 }
355 345