Commit 1c7c83e8 authored by Vasily Gorbik's avatar Vasily Gorbik
Browse files

s390: remove unused _swsusp_reset_dma 



Since commit 39421627 ("s390: remove broken hibernate / power
management support") _swsusp_reset_dma is unused and could be safely
removed.

Reviewed-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 5c46f276

arch/s390/boot/startup.c

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ struct diag_ops __bootdata_preserved(diag_dma_ops) = { 
};

static struct diag210 _diag210_tmp_dma __section(.dma.data);

struct diag210 *__bootdata_preserved(__diag210_tmp_dma) = &_diag210_tmp_dma;

void _swsusp_reset_dma(void);

unsigned long __bootdata_preserved(__swsusp_reset_dma) = __pa(_swsusp_reset_dma);



void error(char *x)

{

arch/s390/boot/text_dma.S

+0 −17
Original line number Diff line number Diff line
@@ -96,23 +96,6 @@ ENTRY(_diag0c_dma) 
	BR_EX_DMA_r14

ENDPROC(_diag0c_dma)



/*

 * void _swsusp_reset_dma(void)

 */

ENTRY(_swsusp_reset_dma)

	larl	%r1,restart_entry

	larl	%r2,.Lrestart_diag308_psw

	og	%r1,0(%r2)

	stg	%r1,0(%r0)

	lghi	%r0,0

	diag	%r0,%r0,0x308

restart_entry:

	lhi	%r1,1

	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE

	sam64

	BR_EX_DMA_r14

ENDPROC(_swsusp_reset_dma)



/*

 * void _diag308_reset_dma(void)

 *

arch/s390/include/asm/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ extern int memory_end_set; 
extern unsigned long memory_end;

extern unsigned long vmalloc_size;

extern unsigned long max_physmem_end;

extern unsigned long __swsusp_reset_dma;



/* The Write Back bit position in the physaddr is given by the SLPC PCI */

extern unsigned long mio_wb_bit_mask;

arch/s390/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct mem_detect_info __bootdata(mem_detect); 


struct exception_table_entry *__bootdata_preserved(__start_dma_ex_table);

struct exception_table_entry *__bootdata_preserved(__stop_dma_ex_table);

unsigned long __bootdata_preserved(__swsusp_reset_dma);

unsigned long __bootdata_preserved(__stext_dma);

unsigned long __bootdata_preserved(__etext_dma);

unsigned long __bootdata_preserved(__sdma);