Date: Sun, 6 Dec 2009 10:49:25 +0100
From: Marc Zyngier <maz@misterjones.org>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Eric Miao <eric.y.miao@gmail.com>, Stephen Rothwell <sfr@canb.auug.org.au>,
       Dominik Brodowski <linux@dominikbrodowski.net>,
       linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the pcmcia tree with the pxa tree
Message-ID: <20091206104925.5f9107b4@taxman.wild-wind.fr.eu.org>
In-Reply-To: <20091130094813.GC1638@n2100.arm.linux.org.uk>
References: <20091130131627.8ccc6033.sfr@canb.auug.org.au>
	<f17812d70911291917y2aeebbberbf31775491f0df4f@mail.gmail.com>
	<20091130091007.7a5fd554@hina.wild-wind.fr.eu.org>
	<f17812d70911300016q1e729569k8c72deb704e3a658@mail.gmail.com>
	<20091130102444.4ebc0a45@life-in-the-fast-lane>
	<20091130094813.GC1638@n2100.arm.linux.org.uk>
Organization: Metropolis -- Nowhere
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1343
Lines: 39

On Mon, 30 Nov 2009 09:48:13 +0000
Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:

Hi Russell,

> What would be a better idea is to rework the driver once my changes
> have hit.  If you need to pass additional data around, you can do it
> like this:

Now that your changes are in Linus' tree, I started looking at
restructuring my code. I sense a small problem though:

[...]
> 	for (i = 0; i < nr; i++) {
> 		skts[i].skt.nr = i;
> 		skts[i].skt.ops = &my_ops;
> 		skts[i].skt.socket.owner = THIS_MODULE;
> 		skts[i].skt.socket.parent = &dev->dev;
> 		skts[i].skt.socket.pci_irq = the_socket_irq;
> 		ret = pxa2xx_drv_pcmcia_add_one(&skts[i].skt);

Unless I'm mistaken, it seems that pxa2xx_drv_pcmcia_add_one() doesn't
call pxa2xx_configure_sockets(), leaving the sockets disabled.

There is several ways to solve this one:
- Add the call to pxa2xx_configure_sockets() to _add_one()
- Do the MECR access in the pxa2xx_viper driver,
- export pxa2xx_configure_sockets() and do the call locally.

What would be your preferred solution?

	M.
-- 
I'm the slime oozin' out from your TV set...
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/