Commit 541b2755 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Fix sparse warnings in arch/powerpc/platforms/pseries 



Don't return void in pseries/iommu.c
Make mce_data_buf static in pseries/ras.c
Make things static in pseries/rtasd.c
Make things static in pseries/setup.c
vtermno may as well be static in platforms/pseries/lpar.c

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3ff1999b

arch/powerpc/platforms/pseries/iommu.c

+9 −6
Original line number Diff line number Diff line
@@ -135,9 +135,10 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, 
	u64 rpn;

	long l, limit;



	if (npages == 1)

		return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,

					   direction);

	if (npages == 1) {

		tce_build_pSeriesLP(tbl, tcenum, npages, uaddr, direction);

		return;

	}



	tcep = __get_cpu_var(tce_page);
@@ -147,9 +148,11 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, 
	if (!tcep) {

		tcep = (u64 *)__get_free_page(GFP_ATOMIC);

		/* If allocation fails, fall back to the loop implementation */

		if (!tcep)

			return tce_build_pSeriesLP(tbl, tcenum, npages,

						   uaddr, direction);

		if (!tcep) {

			tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,

					    direction);

			return;

		}

		__get_cpu_var(tce_page) = tcep;

	}

arch/powerpc/platforms/pseries/lpar.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(plpar_hcall_norets); 
extern void pSeries_find_serial_port(void);





int vtermno;	/* virtual terminal# for udbg  */

static int vtermno;	/* virtual terminal# for udbg  */



#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))

static void udbg_hvsi_putc(char c)

arch/powerpc/platforms/pseries/ras.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];

static DEFINE_SPINLOCK(ras_log_buf_lock);



char mce_data_buf[RTAS_ERROR_LOG_MAX];

static char mce_data_buf[RTAS_ERROR_LOG_MAX];



static int ras_get_sensor_state_token;

static int ras_check_exception_token;

arch/powerpc/platforms/pseries/rtasd.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


static DEFINE_SPINLOCK(rtasd_log_lock);



DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);

static DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);



static char *rtas_log_buf;

static unsigned long rtas_log_start;
@@ -329,7 +329,7 @@ static unsigned int rtas_log_poll(struct file *file, poll_table * wait) 
	return 0;

}



const struct file_operations proc_rtas_log_operations = {

static const struct file_operations proc_rtas_log_operations = {

	.read =		rtas_log_read,

	.poll =		rtas_log_poll,

	.open =		rtas_log_open,

arch/powerpc/platforms/pseries/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void __init fwnmi_init(void) 
		fwnmi_active = 1;

}



void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)

static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)

{

	unsigned int cascade_irq = i8259_irq();

	if (cascade_irq != NO_IRQ)
@@ -482,7 +482,7 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus) 
 * possible with power button press. If ibm,power-off-ups token is used

 * it will allow auto poweron after power is restored.

 */

void pSeries_power_off(void)

static void pSeries_power_off(void)

{

	int rc;

	int rtas_poweroff_ups_token = rtas_token("ibm,power-off-ups");

CRA Git | Maintained and supported by SUSTech CRA and CCSE