* linux-next: manual merge of the pcmcia tree with the net tree
@ 2010-09-16 2:31 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2010-09-16 2:31 UTC (permalink / raw)
To: Dominik Brodowski
Cc: linux-next, linux-kernel, Joe Perches, David Miller, netdev
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/smc91c92_cs.c between commit
636b8116d4e116eca1ac978f546b16fadfc15a6c ("drivers/net/pcmcia: Use
pr_<level> and netdev_<level>") from the net tree and commit
ba0ff6e64dab1a2492d88fdcc40b4eddabd8b451 ("pcmcia: split up
modify_configuration() into two fixup functions") from the pcmcia tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/pcmcia/smc91c92_cs.c
index 3d1c549,0af2fc8..0000000
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@@ -819,13 -792,10 +794,10 @@@ static int check_sig(struct pcmcia_devi
}
if (width) {
- modconf_t mod = {
- .Attributes = CONF_IO_CHANGE_WIDTH,
- };
- printk(KERN_INFO "smc91c92_cs: using 8-bit IO window.\n");
+ pr_info("using 8-bit IO window\n");
smc91c92_suspend(link);
- pcmcia_modify_configuration(link, &mod);
+ pcmcia_fixup_iowidth(link);
smc91c92_resume(link);
return check_sig(link);
}
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the pcmcia tree with the net tree
@ 2010-09-16 2:31 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2010-09-16 2:31 UTC (permalink / raw)
To: Dominik Brodowski
Cc: linux-next, linux-kernel, Joe Perches, David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/pcnet_cs.c between commit
7136e11e0cf520ab3fc7b55a20e60c2ec5ea88e1 ("pcnet_cs: Use pr_fmt and
pr_<level>") from the net tree and commit
b76dc0546709aef18f123847680108c2fd33f203 ("pcmcia pcnet_cs: try setting
io_lines to 16 if card setup fails") from the pcmcia tree.
The latter used dev_notice/info (and moved the code) where the former
used pr_notice, so I used the latter.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the pcmcia tree with the net tree
@ 2010-04-07 4:17 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2010-04-07 4:17 UTC (permalink / raw)
To: Dominik Brodowski
Cc: linux-next, linux-kernel, Alexander Kurz, David Miller, netdev
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/3c589_cs.c between commit
f64e96973a1fa885ce6e4f7e3fdbae83de98fcab ("net/pcmcia/3c589_cs: using
netdev_info and friends where appropriate") from the net tree and commits
cbd8ca0260b78f3b4157dc8ff23edbd211c4eef5 ("pcmcia: re-work
pcmcia_request_irq()") and cc25a704447fad12205ca8c7c42d6bba1c1590b0
("pcmcia: dev_node removal (drivers with unregister_netdev check)") from
the pcmcia tree.
Most of these conflicts are just due to unrelated white space changes in
the net tree commit. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/pcmcia/3c589_cs.c
index 580977f,5ab589d..0000000
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@@ -129,13 -106,12 +129,12 @@@ enum RxFilter
struct el3_private {
struct pcmcia_device *p_dev;
- dev_node_t node;
- /* For transceiver monitoring */
- struct timer_list media;
- u16 media_status;
- u16 fast_poll;
- unsigned long last_irq;
- spinlock_t lock;
+ /* For transceiver monitoring */
+ struct timer_list media;
+ u16 media_status;
+ u16 fast_poll;
+ unsigned long last_irq;
+ spinlock_t lock;
};
static const char *if_names[] = { "auto", "10baseT", "10base2", "AUI" };
@@@ -301,8 -274,8 +297,8 @@@ static int tc589_config(struct pcmcia_d
ret = pcmcia_request_configuration(link, &link->conf);
if (ret)
goto failed;
-
+
- dev->irq = link->irq.AssignedIRQ;
+ dev->irq = link->irq;
dev->base_addr = link->io.BasePort1;
ioaddr = dev->base_addr;
EL3WINDOW(0);
@@@ -335,8 -308,7 +331,7 @@@
dev->if_port = if_port;
else
printk(KERN_ERR "3c589_cs: invalid if_port requested\n");
-
+
- link->dev_node = &lp->node;
SET_NETDEV_DEV(dev, &link->dev);
if (register_netdev(dev) != 0) {
@@@ -344,15 -316,13 +339,12 @@@
goto failed;
}
- strcpy(lp->node.dev_name, dev->name);
-
- printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, "
- "hw_addr %pM\n",
- dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq,
- dev->dev_addr);
- printk(KERN_INFO " %dK FIFO split %s Rx:Tx, %s xcvr\n",
- (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3],
- if_names[dev->if_port]);
+ netdev_info(dev, "3Com 3c%s, io %#3lx, irq %d, hw_addr %pM\n",
+ (multi ? "562" : "589"), dev->base_addr, dev->irq,
+ dev->dev_addr);
+ netdev_info(dev, " %dK FIFO split %s Rx:Tx, %s xcvr\n",
+ (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3],
+ if_names[dev->if_port]);
return 0;
failed:
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the pcmcia tree with the net tree
@ 2009-12-04 3:53 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2009-12-04 3:53 UTC (permalink / raw)
To: Dominik Brodowski
Cc: linux-next, linux-kernel, Joe Perches, David S. Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/xirc2ps_cs.c between commit
8e95a2026f3b43f7c3d676adaccd2de9532e8dcc ("drivers/net: Move && and || to
end of previous line") from the net tree and commit
dddfbd824b96a25da0b2f1cf35c0be33ef2422fe ("pcmcia: convert net pcmcia
drivers to use new CIS helpers") from the pcmcia tree.
I fixed it up (by using the pcmcia tree version - since that removed the
conflicting code that was modified in the net tree commit) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the pcmcia tree with the net tree
@ 2009-11-30 2:16 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2009-11-30 2:16 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: linux-next, linux-kernel, Julia Lawall, David S. Miller
Hi Dominik,
Today's linux-next merge of the pcmcia tree got conflicts in
drivers/net/pcmcia/fmvj18x_cs.c and drivers/net/pcmcia/nmclan_cs.c
between commit dddcb445a33c80bca11a6566364935e681c85809 ("drivers/net:
remove exceptional & on function name") from the net tree and commit
5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044 ("pcmcia: rework the irq_req_t
typedef") from the pcmcia tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/pcmcia/fmvj18x_cs.c
index 57e0961,6e3e1ce..0000000
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@@ -262,10 -255,8 +255,8 @@@ static int fmvj18x_probe(struct pcmcia_
link->io.IOAddrLines = 5;
/* Interrupt setup */
- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;
- link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
- link->irq.Handler = &fjn_interrupt;
+ link->irq.Handler = fjn_interrupt;
- link->irq.Instance = dev;
/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
diff --cc drivers/net/pcmcia/nmclan_cs.c
index b12e695,dae5ef6..0000000
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@@ -477,10 -463,8 +463,8 @@@ static int nmclan_probe(struct pcmcia_d
link->io.NumPorts1 = 32;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 5;
- link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
- link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+ link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
- link->irq.Handler = &mace_interrupt;
+ link->irq.Handler = mace_interrupt;
- link->irq.Instance = dev;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-16 2:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-16 2:31 linux-next: manual merge of the pcmcia tree with the net tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-09-16 2:31 Stephen Rothwell
2010-04-07 4:17 Stephen Rothwell
2009-12-04 3:53 Stephen Rothwell
2009-11-30 2:16 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox