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

Commit 02e87d1a authored by Kristoffer Ericson's avatar Kristoffer Ericson Committed by Linus Torvalds
Browse files

pcmcia: cleanup/fixup patch for sa1100_jornada_pcmcia driver 



Clean up the /drivers/pcmcia/sa1100_jornada.c file with respect to
formatting.  It also changes a build warning into a code comment (since
its a pain to watch every build and havent seen any problems with driver
in 3.5years).

Signed-off-by: default avatarKristoffer Ericson <kristoffer.ericson@gmail.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e6be4a8c

drivers/pcmcia/sa1100_jornada720.c

+85 −71
Original line number Diff line number Diff line
@@ -16,22 +16,24 @@ 


#include "sa1111_generic.h"



/* Does SOCKET1_3V actually do anything? */

#define SOCKET0_POWER	GPIO_GPIO0

#define SOCKET0_3V	GPIO_GPIO2

#define SOCKET1_POWER	(GPIO_GPIO1 | GPIO_GPIO3)

#warning *** Does SOCKET1_3V actually do anything?

#define SOCKET1_3V	GPIO_GPIO3



static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;



	/*

	* What is all this crap for?

	*/

	GRER |= 0x00000002;

	/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */

  sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);

  sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);

  sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);

	sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0);

	sa1111_set_io(SA1111_DEV(skt->dev), pin, 0);

	sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0);



	return sa1111_pcmcia_hw_init(skt);

}
@@ -42,7 +44,7 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s 
	unsigned int pa_dwr_mask, pa_dwr_set;

	int ret;



printk("%s(): config socket %d vcc %d vpp %d\n", __func__,

	printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,

		skt->nr, state->Vcc, state->Vpp);



	switch (skt->nr) {
@@ -51,9 +53,15 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __func__, 


		switch (state->Vcc) {

		default:

    case 0:	pa_dwr_set = 0;					break;

    case 33:	pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;	break;

    case 50:	pa_dwr_set = SOCKET0_POWER;			break;

		case  0:

			pa_dwr_set = 0;

			break;

		case 33:

			pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;

			break;

		case 50:

			pa_dwr_set = SOCKET0_POWER;

			break;

		}

		break;
@@ -62,9 +70,15 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __func__, 


		switch (state->Vcc) {

		default:

    case 0:	pa_dwr_set = 0;					break;

    case 33:	pa_dwr_set = SOCKET1_POWER;			break;

    case 50:	pa_dwr_set = SOCKET1_POWER;			break;

		case 0:

			pa_dwr_set = 0;

			break;

		case 33:

			pa_dwr_set = SOCKET1_POWER;

			break;

		case 50:

			pa_dwr_set = SOCKET1_POWER;

			break;

		}

		break;
@@ -75,7 +89,7 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __func__, 
	if (state->Vpp != state->Vcc && state->Vpp != 0) {

		printk(KERN_ERR "%s(): slot cannot support VPP %u\n",

			__func__, state->Vpp);

    return -1;

		return -EPERM;

	}



	ret = sa1111_pcmcia_configure_socket(skt, state);