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

Commit 1ace7566 authored by Russell King's avatar Russell King
Browse files

ARM: io: ecard: move ioaddr() inside __ecard_address 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d0a84e72

arch/arm/include/asm/ecard.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ struct expansion_card { 


	/* Private internal data */

	const char		*card_desc;	/* Card description		*/

	CONST unsigned int	podaddr;	/* Base Linux address for card	*/

	CONST loader_t		loader;		/* loader program */

	u64			dma_mask;

};

arch/arm/kernel/ecard.c

+6 −5
Original line number Diff line number Diff line
@@ -678,13 +678,13 @@ static int __init ecard_probeirqhw(void) 
#define IO_EC_MEMC8_BASE 0

#endif



static unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed)

static void __iomem *__ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed)

{

	unsigned long address = 0;

	int slot = ec->slot_no;



	if (ec->slot_no == 8)

		return IO_EC_MEMC8_BASE;

		return (void __iomem *)ioaddr(IO_EC_MEMC8_BASE);



	ectcr &= ~(1 << slot);
@@ -719,7 +719,7 @@ static unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t 
#ifdef IOMD_ECTCR

	iomd_writeb(ectcr, IOMD_ECTCR);

#endif

	return address;

	return (void __iomem *)(address ? ioaddr(address) : NULL);

}



static int ecard_prints(struct seq_file *m, ecard_t *ec)
@@ -990,6 +990,7 @@ ecard_probe(int slot, card_type_t type) 
	ecard_t **ecp;

	ecard_t *ec;

	struct ex_ecid cid;

	void __iomem *addr;

	int i, rc;



	ec = ecard_alloc_card(type, slot);
@@ -999,7 +1000,7 @@ ecard_probe(int slot, card_type_t type) 
	}



	rc = -ENODEV;

	if ((ec->podaddr = __ecard_address(ec, type, ECARD_SYNC)) == 0)

	if ((addr = __ecard_address(ec, type, ECARD_SYNC)) == NULL)

		goto nodev;



	cid.r_zero = 1;
@@ -1019,7 +1020,7 @@ ecard_probe(int slot, card_type_t type) 
	ec->cid.fiqmask = cid.r_fiqmask;

	ec->cid.fiqoff  = ecard_gets24(cid.r_fiqoff);

	ec->fiqaddr	=

	ec->irqaddr	= (void __iomem *)ioaddr(ec->podaddr);

	ec->irqaddr	= addr;



	if (ec->cid.is) {

		ec->irqmask = ec->cid.irqmask;