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

Commit 9ecba1f2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] rpc: ecard: remove deprecated ecard_address() and relatives 



ecard_address() is obsolete, and has been marked deprecated since
at least 2.6.12-rc2.  All in-tree users have been updated to use
the new approach, so it's time to remove this.

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

arch/arm/kernel/ecard.c

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

#endif



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

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

{

	unsigned long address = 0;

	int slot = ec->slot_no;
@@ -1002,7 +1002,7 @@ ecard_probe(int slot, card_type_t type) 
	}



	rc = -ENODEV;

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

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

		goto nodev;



	cid.r_zero = 1;
@@ -1141,10 +1141,10 @@ static int ecard_drv_probe(struct device *dev) 


	id = ecard_match_device(drv->id_table, ec);



	ecard_claim(ec);

	ec->claimed = 1;

	ret = drv->probe(ec, id);

	if (ret)

		ecard_release(ec);

		ec->claimed = 0;

	return ret;

}
@@ -1154,7 +1154,7 @@ static int ecard_drv_remove(struct device *dev) 
	struct ecard_driver *drv = ECARD_DRV(dev->driver);



	drv->remove(ec);

	ecard_release(ec);

	ec->claimed = 0;



	/*

	 * Restore the default operations.  We ensure that the
@@ -1182,7 +1182,7 @@ static void ecard_drv_shutdown(struct device *dev) 
	if (dev->driver) {

		if (drv->shutdown)

			drv->shutdown(ec);

		ecard_release(ec);

		ec->claimed = 0;

	}



	/*
@@ -1239,7 +1239,6 @@ static int ecard_bus_init(void) 
postcore_initcall(ecard_bus_init);



EXPORT_SYMBOL(ecard_readchunk);

EXPORT_SYMBOL(__ecard_address);

EXPORT_SYMBOL(ecard_register_driver);

EXPORT_SYMBOL(ecard_remove_driver);

EXPORT_SYMBOL(ecard_bus_type);

arch/arm/kernel/ecard.h

+13 −0
Original line number Diff line number Diff line
@@ -54,3 +54,16 @@ struct ex_chunk_dir { 
#define c_len(x)	((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16))

#define c_start(x)	((x)->r_start)

};



typedef enum ecard_type {		/* Cards address space		*/

	ECARD_IOC,

	ECARD_MEMC,

	ECARD_EASI

} card_type_t;



typedef enum {				/* Speed for ECARD_IOC space	*/

	ECARD_SLOW	 = 0,

	ECARD_MEDIUM	 = 1,

	ECARD_FAST	 = 2,

	ECARD_SYNC	 = 3

} card_speed_t;

include/asm-arm/ecard.h

+0 −35
Original line number Diff line number Diff line
@@ -85,19 +85,6 @@ 


#define MAX_ECARDS	9



typedef enum {				/* Cards address space		*/

	ECARD_IOC,

	ECARD_MEMC,

	ECARD_EASI

} card_type_t;



typedef enum {				/* Speed for ECARD_IOC space	*/

	ECARD_SLOW	 = 0,

	ECARD_MEDIUM	 = 1,

	ECARD_FAST	 = 2,

	ECARD_SYNC	 = 3

} card_speed_t;



struct ecard_id {			/* Card ID structure		*/

	unsigned short	manufacturer;

	unsigned short	product;
@@ -189,16 +176,6 @@ struct in_chunk_dir { 
	} d;

};



/*

 * ecard_claim: claim an expansion card entry

 */

#define ecard_claim(ec) ((ec)->claimed = 1)



/*

 * ecard_release: release an expansion card entry

 */

#define ecard_release(ec) ((ec)->claimed = 0)



/*

 * Read a chunk from an expansion card

 * cd : where to put read data
@@ -208,18 +185,6 @@ struct in_chunk_dir { 
 */

extern int ecard_readchunk (struct in_chunk_dir *cd, struct expansion_card *ec, int id, int num);



/*

 * Obtain the address of a card.  This returns the "old style" address

 * and should no longer be used.

 */

static inline unsigned int __deprecated

ecard_address(struct expansion_card *ec, card_type_t type, card_speed_t speed)

{

	extern unsigned int __ecard_address(struct expansion_card *,

					    card_type_t, card_speed_t);

	return __ecard_address(ec, type, speed);

}



/*

 * Request and release ecard resources

 */