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

Commit d83b8b85 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: define MAX_HWIFS in <linux/ide.h> 



* Now that ide_hwif_t instances are allocated dynamically
  the difference between MAX_HWIFS == 2 and MAX_HWIFS == 10
  is ~100 bytes (x86-32) so use MAX_HWIFS == 10 on all archs
  except these ones that use MAX_HWIFS == 1.

* Define MAX_HWIFS in <linux/ide.h> instead of <asm/ide.h>.

[ Please note that avr32/cris/v850 have no <asm/ide.h>
  and alpha/ia64/sh always define CONFIG_IDE_MAX_HWIFS. ]

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2c9d8643

include/asm-arm/ide.h

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ 


#ifdef __KERNEL__



#ifndef MAX_HWIFS

#define MAX_HWIFS	4

#endif



#define __ide_mm_insw(port,addr,len)	readsw(port,addr,len)

#define __ide_mm_insl(port,addr,len)	readsl(port,addr,len)

#define __ide_mm_outsw(port,addr,len)	writesw(port,addr,len)

include/asm-blackfin/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#ifdef __KERNEL__

/****************************************************************************/



#define MAX_HWIFS	1



#include <asm-generic/ide_iops.h>



/****************************************************************************/

include/asm-frv/ide.h

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 
#include <asm/io.h>

#include <asm/irq.h>



#ifndef MAX_HWIFS

#define MAX_HWIFS 8

#endif



/****************************************************************************/

/*

 * some bits needed for parts of the IDE subsystem to compile

include/asm-h8300/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#ifdef __KERNEL__

/****************************************************************************/



#define MAX_HWIFS	1



#include <asm-generic/ide_iops.h>



/****************************************************************************/

include/asm-m32r/ide.h

+0 −8
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ 


#include <asm/m32r.h>



#ifndef MAX_HWIFS

# ifdef CONFIG_BLK_DEV_IDEPCI

#define MAX_HWIFS	10

# else

#define MAX_HWIFS	2

# endif

#endif



static __inline__ int ide_default_irq(unsigned long base)

{

	switch (base) {