* [RFC] PCMCIA patches for 2.6.34
@ 2010-01-06 11:45 Dominik Brodowski
2010-01-06 11:46 ` [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter Dominik Brodowski
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Dominik Brodowski @ 2010-01-06 11:45 UTC (permalink / raw)
To: linux-pcmcia; +Cc: netdev
Hey,
here are some patches relating to the PCMCIA subsystem, and intended for
2.6.34. I'm interested in your input to this patch series. They'll be
sent to the PCMCIA list shortly, with CC to other lists if deemed
appropriate.
pcmcia: make use of pcmcia_dev_resume() return value
pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter
pcmcia: do not meddle with already assigned resources
pcmcia: validate CIS, not CIS cache.
pcmcia: cleanup pccard_validate_cis()
pcmcia: improve check for same card in slot after resume
pcmcia: CardBus doesn't need CIS access
pcmcia: call CIS cleanup from ds.c
pcmcia: rsrc_nonstatic io memory probe improvements
pcmcia: do not lock socket driver module in pcmcia_get_socket()
pcmcia: do not lock socket driver module on card insert
pcmcia: remove useless indirection
pcmcia: remove some rsrc_mgr indirections
pcmcia: m32r uses static socket resources
pcmcia: m8xx_pcmcia.c should use iodyn resource manager
drivers/net/pcmcia/smc91c92_cs.c | 6 +-
drivers/pcmcia/Kconfig | 3 -
drivers/pcmcia/cardbus.c | 175 ++-----------------
drivers/pcmcia/cistpl.c | 368 +++++++++++++-------------------------
drivers/pcmcia/cs.c | 89 +++++-----
drivers/pcmcia/cs_internal.h | 25 ---
drivers/pcmcia/ds.c | 25 +++-
drivers/pcmcia/m32r_cfc.c | 2 +-
drivers/pcmcia/m8xx_pcmcia.c | 2 +-
drivers/pcmcia/pcmcia_resource.c | 17 ++
drivers/pcmcia/rsrc_mgr.c | 24 ---
drivers/pcmcia/rsrc_nonstatic.c | 184 ++++++++++++-------
include/pcmcia/ss.h | 9 +-
13 files changed, 341 insertions(+), 588 deletions(-)
Best,
Dominik
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter
2010-01-06 11:45 [RFC] PCMCIA patches for 2.6.34 Dominik Brodowski
@ 2010-01-06 11:46 ` Dominik Brodowski
2010-01-07 4:23 ` David Miller
2010-01-06 14:03 ` [RFC] PCMCIA patches for 2.6.34 Wolfram Sang
2010-01-09 12:16 ` Wolfram Sang
2 siblings, 1 reply; 6+ messages in thread
From: Dominik Brodowski @ 2010-01-06 11:46 UTC (permalink / raw)
To: linux-pcmcia; +Cc: Dominik Brodowski, netdev, Komuro
Komuro pointed out correctly that I missed one IRQ_FIRST_SHARED
parameter in smc91c92_cs.c, and that another line could be writter
more beautifully.
CC: netdev@vger.kernel.org
CC: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
drivers/net/pcmcia/smc91c92_cs.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 6dd486d..aa57cfd 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -453,8 +453,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA;
- link->irq.Attributes =
- IRQ_TYPE_DYNAMIC_SHARING;
+ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
link->io.IOAddrLines = 16;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
link->io.NumPorts2 = 8;
@@ -652,8 +651,7 @@ static int osi_config(struct pcmcia_device *link)
link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA;
- link->irq.Attributes =
- IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
link->io.NumPorts1 = 64;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
link->io.NumPorts2 = 8;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter
2010-01-06 11:46 ` [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter Dominik Brodowski
@ 2010-01-07 4:23 ` David Miller
2010-01-07 8:20 ` Dominik Brodowski
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2010-01-07 4:23 UTC (permalink / raw)
To: linux; +Cc: linux-pcmcia, netdev, komurojun-mbn
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Wed, 6 Jan 2010 12:46:13 +0100
> Komuro pointed out correctly that I missed one IRQ_FIRST_SHARED
> parameter in smc91c92_cs.c, and that another line could be writter
> more beautifully.
>
> CC: netdev@vger.kernel.org
> CC: Komuro <komurojun-mbn@nifty.com>
> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Please can the pcmcia tree person integrate this one?
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter
2010-01-07 4:23 ` David Miller
@ 2010-01-07 8:20 ` Dominik Brodowski
0 siblings, 0 replies; 6+ messages in thread
From: Dominik Brodowski @ 2010-01-07 8:20 UTC (permalink / raw)
To: David Miller; +Cc: linux-pcmcia, netdev, komurojun-mbn
Hey,
On Wed, Jan 06, 2010 at 08:23:32PM -0800, David Miller wrote:
> From: Dominik Brodowski <linux@dominikbrodowski.net>
> Date: Wed, 6 Jan 2010 12:46:13 +0100
>
> > Komuro pointed out correctly that I missed one IRQ_FIRST_SHARED
> > parameter in smc91c92_cs.c, and that another line could be writter
> > more beautifully.
> >
> > CC: netdev@vger.kernel.org
> > CC: Komuro <komurojun-mbn@nifty.com>
> > Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
>
> Please can the pcmcia tree person integrate this one?
That's the plan, thanks.
Best,
Dominik
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] PCMCIA patches for 2.6.34
2010-01-06 11:45 [RFC] PCMCIA patches for 2.6.34 Dominik Brodowski
2010-01-06 11:46 ` [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter Dominik Brodowski
@ 2010-01-06 14:03 ` Wolfram Sang
2010-01-09 12:16 ` Wolfram Sang
2 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2010-01-06 14:03 UTC (permalink / raw)
To: linux-pcmcia, netdev
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
Hi Dominik,
> here are some patches relating to the PCMCIA subsystem, and intended for
> 2.6.34. I'm interested in your input to this patch series. They'll be
> sent to the PCMCIA list shortly, with CC to other lists if deemed
Looks interesting, I will pull your master(?)-branch this evening and give it a
test. Any hints on what to try/look for especially? Suspend/Resume seems one
candidate next to the usual "I'll try a bunch of cards"...
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] PCMCIA patches for 2.6.34
2010-01-06 11:45 [RFC] PCMCIA patches for 2.6.34 Dominik Brodowski
2010-01-06 11:46 ` [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter Dominik Brodowski
2010-01-06 14:03 ` [RFC] PCMCIA patches for 2.6.34 Wolfram Sang
@ 2010-01-09 12:16 ` Wolfram Sang
2 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2010-01-09 12:16 UTC (permalink / raw)
To: linux-pcmcia, netdev
[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]
On Wed, Jan 06, 2010 at 12:45:31PM +0100, Dominik Brodowski wrote:
> Hey,
>
> here are some patches relating to the PCMCIA subsystem, and intended for
> 2.6.34. I'm interested in your input to this patch series. They'll be
> sent to the PCMCIA list shortly, with CC to other lists if deemed
> appropriate.
>
> pcmcia: make use of pcmcia_dev_resume() return value
> pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter
> pcmcia: do not meddle with already assigned resources
> pcmcia: validate CIS, not CIS cache.
> pcmcia: cleanup pccard_validate_cis()
> pcmcia: improve check for same card in slot after resume
> pcmcia: CardBus doesn't need CIS access
> pcmcia: call CIS cleanup from ds.c
> pcmcia: rsrc_nonstatic io memory probe improvements
> pcmcia: do not lock socket driver module in pcmcia_get_socket()
> pcmcia: do not lock socket driver module on card insert
> pcmcia: remove useless indirection
> pcmcia: remove some rsrc_mgr indirections
> pcmcia: m32r uses static socket resources
> pcmcia: m8xx_pcmcia.c should use iodyn resource manager
Whole series:
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-01-09 12:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-06 11:45 [RFC] PCMCIA patches for 2.6.34 Dominik Brodowski
2010-01-06 11:46 ` [PATCH 02/15] pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter Dominik Brodowski
2010-01-07 4:23 ` David Miller
2010-01-07 8:20 ` Dominik Brodowski
2010-01-06 14:03 ` [RFC] PCMCIA patches for 2.6.34 Wolfram Sang
2010-01-09 12:16 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).