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

Commit 104a416d authored by Dmitry Artamonow's avatar Dmitry Artamonow Committed by Russell King
Browse files

[ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpers 



Replace all occurences with assign_h3600_egpio.
Also simplify code a bit by replacing couple of if-else
statements with one-line equivalents.

Signed-off-by: default avatarDmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ddcd8c09

arch/arm/mach-sa1100/h3600.c

+1 −5
Original line number Diff line number Diff line
@@ -92,11 +92,7 @@ static int h3600_irda_set_power(struct device *dev, unsigned int state) 


static void h3600_irda_set_speed(struct device *dev, unsigned int speed)

{

	if (speed < 4000000) {

		clr_h3600_egpio(IPAQ_EGPIO_IR_FSEL);

	} else {

		set_h3600_egpio(IPAQ_EGPIO_IR_FSEL);

	}

	assign_h3600_egpio(IPAQ_EGPIO_IR_FSEL, !(speed < 4000000));

}



static struct irda_platform_data h3600_irda_data = {

arch/arm/mach-sa1100/include/mach/h3600.h

+0 −13
Original line number Diff line number Diff line
@@ -105,19 +105,6 @@ static __inline__ void assign_h3600_egpio(enum ipaq_egpio_type x, int level) 
		ipaq_model_ops.control(x,level);

}



static __inline__ void clr_h3600_egpio(enum ipaq_egpio_type x)

{

	if (ipaq_model_ops.control)

		ipaq_model_ops.control(x,0);

}



static __inline__ void set_h3600_egpio(enum ipaq_egpio_type x)

{

	if (ipaq_model_ops.control)

		ipaq_model_ops.control(x,1);

}





#endif /* ASSEMBLY */



#endif /* _INCLUDE_H3600_H_ */

drivers/pcmcia/sa1100_h3600.c

+10 −13
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ static void h3600_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) 
	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

  

	/* Disable CF bus: */

	clr_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);

	clr_h3600_egpio(IPAQ_EGPIO_OPT_ON);

	set_h3600_egpio(IPAQ_EGPIO_OPT_RESET);

	assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);

	assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);

	assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);

}



static void
@@ -79,10 +79,7 @@ h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_ 
		return -1;

	}



	if (state->flags & SS_RESET)

		set_h3600_egpio(IPAQ_EGPIO_CARD_RESET);

	else

		clr_h3600_egpio(IPAQ_EGPIO_CARD_RESET);

	assign_h3600_egpio(IPAQ_EGPIO_CARD_RESET, !!(state->flags & SS_RESET));



	/* Silently ignore Vpp, output enable, speaker enable. */
@@ -92,9 +89,9 @@ h3600_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_ 
static void h3600_pcmcia_socket_init(struct soc_pcmcia_socket *skt)

{

	/* Enable CF bus: */

	set_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);

	set_h3600_egpio(IPAQ_EGPIO_OPT_ON);

	clr_h3600_egpio(IPAQ_EGPIO_OPT_RESET);

	assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 1);

	assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 1);

	assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 0);



	msleep(10);
@@ -112,10 +109,10 @@ static void h3600_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) 
	 * socket 0 then socket 1.

	 */

	if (skt->nr == 1) {

		clr_h3600_egpio(IPAQ_EGPIO_OPT_ON);

		clr_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON);

		assign_h3600_egpio(IPAQ_EGPIO_OPT_ON, 0);

		assign_h3600_egpio(IPAQ_EGPIO_OPT_NVRAM_ON, 0);

		/* hmm, does this suck power? */

		set_h3600_egpio(IPAQ_EGPIO_OPT_RESET);

		assign_h3600_egpio(IPAQ_EGPIO_OPT_RESET, 1);

	}

}