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

Commit 8b2cc917 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

drivers/scsi/dpt_i2o.c: fix build on alpha 



alpha:

drivers/scsi/dpt_i2o.c:1997: error: implicit declaration of function 'adpt_alpha_info'
drivers/scsi/dpt_i2o.c: At top level:
drivers/scsi/dpt_i2o.c:2032: warning: conflicting types for 'adpt_alpha_info'
drivers/scsi/dpt_i2o.c:2032: error: static declaration of 'adpt_alpha_info' follows non-static declaration
drivers/scsi/dpt_i2o.c:1997: error: previous implicit declaration of 'adpt_alpha_info' was here

Due to a copy-n-paste error in drivers/scsi/dpti.h.

Fix that up and remove some of the many daft static-declarations-in-a-header
which this driver enjoys.

Cc: Miquel van Smoorenburg <miquels@cistron.nl>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5be7a479

drivers/scsi/dpt_i2o.c

+36 −42
Original line number Diff line number Diff line
@@ -1967,45 +1967,6 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg) 
	return rcode;

}





/*

 * This routine returns information about the system.  This does not effect

 * any logic and if the info is wrong - it doesn't matter.

 */



/* Get all the info we can not get from kernel services */

static int adpt_system_info(void __user *buffer)

{

	sysInfo_S si;



	memset(&si, 0, sizeof(si));



	si.osType = OS_LINUX;

	si.osMajorVersion = 0;

	si.osMinorVersion = 0;

	si.osRevision = 0;

	si.busType = SI_PCI_BUS;

	si.processorFamily = DPTI_sig.dsProcessorFamily;



#if defined __i386__ 

	adpt_i386_info(&si);

#elif defined (__ia64__)

	adpt_ia64_info(&si);

#elif defined(__sparc__)

	adpt_sparc_info(&si);

#elif defined (__alpha__)

	adpt_alpha_info(&si);

#else

	si.processorType = 0xff ;

#endif

	if(copy_to_user(buffer, &si, sizeof(si))){

		printk(KERN_WARNING"dpti: Could not copy buffer TO user\n");

		return -EFAULT;

	}



	return 0;

}



#if defined __ia64__ 

static void adpt_ia64_info(sysInfo_S* si)

{
@@ -2016,7 +1977,6 @@ static void adpt_ia64_info(sysInfo_S* si) 
}

#endif





#if defined __sparc__ 

static void adpt_sparc_info(sysInfo_S* si)

{
@@ -2026,7 +1986,6 @@ static void adpt_sparc_info(sysInfo_S* si) 
	si->processorType = PROC_ULTRASPARC;

}

#endif



#if defined __alpha__ 

static void adpt_alpha_info(sysInfo_S* si)

{
@@ -2038,7 +1997,6 @@ static void adpt_alpha_info(sysInfo_S* si) 
#endif



#if defined __i386__



static void adpt_i386_info(sysInfo_S* si)

{

	// This is all the info we need for now
@@ -2059,9 +2017,45 @@ static void adpt_i386_info(sysInfo_S* si) 
		break;

	}

}

#endif



/*

 * This routine returns information about the system.  This does not effect

 * any logic and if the info is wrong - it doesn't matter.

 */



/* Get all the info we can not get from kernel services */

static int adpt_system_info(void __user *buffer)

{

	sysInfo_S si;



	memset(&si, 0, sizeof(si));



	si.osType = OS_LINUX;

	si.osMajorVersion = 0;

	si.osMinorVersion = 0;

	si.osRevision = 0;

	si.busType = SI_PCI_BUS;

	si.processorFamily = DPTI_sig.dsProcessorFamily;



#if defined __i386__

	adpt_i386_info(&si);

#elif defined (__ia64__)

	adpt_ia64_info(&si);

#elif defined(__sparc__)

	adpt_sparc_info(&si);

#elif defined (__alpha__)

	adpt_alpha_info(&si);

#else

	si.processorType = 0xff ;

#endif

	if (copy_to_user(buffer, &si, sizeof(si))){

		printk(KERN_WARNING"dpti: Could not copy buffer TO user\n");

		return -EFAULT;

	}



	return 0;

}



static int adpt_ioctl(struct inode *inode, struct file *file, uint cmd,

	      ulong arg)

drivers/scsi/dpti.h

+0 −13
Original line number Diff line number Diff line
@@ -316,19 +316,6 @@ static int adpt_close(struct inode *inode, struct file *file); 
static void adpt_delay(int millisec);

#endif



#if defined __ia64__ 

static void adpt_ia64_info(sysInfo_S* si);

#endif

#if defined __sparc__ 

static void adpt_sparc_info(sysInfo_S* si);

#endif

#if defined __alpha__ 

static void adpt_sparc_info(sysInfo_S* si);

#endif

#if defined __i386__

static void adpt_i386_info(sysInfo_S* si);

#endif



#define PRINT_BUFFER_SIZE     512



#define HBA_FLAGS_DBG_FLAGS_MASK         0xffff0000	// Mask for debug flags