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

Commit 9dfcd15a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ide_default_io_ctl() macro 



It is always == '((base) + 0x206)' if CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=y
and it is not needed otherwise (arm, blackfin, parisc, ppc64, sh, sparc[64]).

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

drivers/ide/ide.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -202,7 +202,7 @@ static void __init init_ide_data (void) 
	for (index = 0; index < MAX_HWIFS; ++index) {

	for (index = 0; index < MAX_HWIFS; ++index) {

		ide_hwif_t *hwif = &ide_hwifs[index];

		ide_hwif_t *hwif = &ide_hwifs[index];

		unsigned long io_addr = ide_default_io_base(index);

		unsigned long io_addr = ide_default_io_base(index);

		unsigned long ctl_addr = ide_default_io_ctl(io_addr);

		unsigned long ctl_addr = io_addr + 0x206;





		ide_init_port_data(hwif, index);

		ide_init_port_data(hwif, index);

include/asm-alpha/ide.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -37,8 +37,6 @@ static inline unsigned long ide_default_io_base(int index) 
	}

	}

}

}





#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */



#ifdef CONFIG_PCI

#ifdef CONFIG_PCI

#define ide_init_default_irq(base)	(0)

#define ide_init_default_irq(base)	(0)

#else

#else

include/asm-arm/ide.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -17,14 +17,6 @@ 
#define MAX_HWIFS	4

#define MAX_HWIFS	4

#endif

#endif





#if !defined(CONFIG_ARCH_L7200)

# ifdef CONFIG_ARCH_CLPS7500

#  define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */

# else

#  define ide_default_io_ctl(base)	(0)

# endif

#endif /* !ARCH_L7200 */



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

#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_insl(port,addr,len)	readsl(port,addr,len)

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

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

include/asm-blackfin/ide.h

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




#define MAX_HWIFS	1

#define MAX_HWIFS	1





/* Legacy ... BLK_DEV_IDECS */

#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */





#include <asm-generic/ide_iops.h>

#include <asm-generic/ide_iops.h>





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

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

include/asm-ia64/ide.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -44,8 +44,6 @@ static inline unsigned long ide_default_io_base(int index) 
	}

	}

}

}





#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */



#ifdef CONFIG_PCI

#ifdef CONFIG_PCI

#define ide_init_default_irq(base)	(0)

#define ide_init_default_irq(base)	(0)

#else

#else