From: Randy Dunlap <randy.dunlap@oracle•com>
To: Alan Cox <alan@lxorguk•ukuu.org.uk>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
jgarzik@pobox•com
Subject: Re: linux-next: Tree for July 8 (ns8390)
Date: Tue, 8 Jul 2008 14:47:15 -0700 [thread overview]
Message-ID: <20080708144715.a904d426.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20080708193513.51000246@the-village.bc.nu>
On Tue, 8 Jul 2008 19:35:13 +0100 Alan Cox wrote:
> Diff between my tree 8390 bits and linux-next ones
>
> 8390: diff between next and my driver
>
> From: Alan Cox <alan@redhat•com>
>
> Please try this and if it sorts it fold it into the driver. This is a diff
> between my tree and the linux-next tree
Yes, that's good. Thanks/Ack.
> ---
>
> drivers/net/hp-plus.c | 2 +-
> drivers/net/hp.c | 2 +-
> drivers/net/ne.c | 8 ++++----
> drivers/net/wd.c | 2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
>
> diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
> index c2c4f49..8239939 100644
> --- a/drivers/net/hp-plus.c
> +++ b/drivers/net/hp-plus.c
> @@ -262,7 +262,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
> }
>
> outw(Perf_Page, ioaddr + HP_PAGING);
> - NS8390_init(dev, 0);
> + NS8390p_init(dev, 0);
> /* Leave the 8390 and HP chip reset. */
> outw(inw(ioaddr + HPP_OPTION) & ~EnableIRQ, ioaddr + HPP_OPTION);
>
> diff --git a/drivers/net/hp.c b/drivers/net/hp.c
> index 8281209..0a8c649 100644
> --- a/drivers/net/hp.c
> +++ b/drivers/net/hp.c
> @@ -389,7 +389,7 @@ static void __init
> hp_init_card(struct net_device *dev)
> {
> int irq = dev->irq;
> - NS8390_init(dev, 0);
> + NS8390p_init(dev, 0);
> outb_p(irqmap[irq&0x0f] | HP_RUN,
> dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
> return;
> diff --git a/drivers/net/ne.c b/drivers/net/ne.c
> index 1412697..4a8a4b1 100644
> --- a/drivers/net/ne.c
> +++ b/drivers/net/ne.c
> @@ -355,7 +355,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
> }
>
> /* Read the 16 bytes of station address PROM.
> - We must first initialize registers, similar to NS8390_init(eifdev, 0).
> + We must first initialize registers, similar to NS8390p_init(eifdev, 0).
> We can't reliably read the SAPROM address without this.
> (I learned the hard way!). */
> {
> @@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
> #ifdef CONFIG_NET_POLL_CONTROLLER
> dev->poll_controller = eip_poll;
> #endif
> - NS8390_init(dev, 0);
> + NS8390p_init(dev, 0);
>
> ret = register_netdev(dev);
> if (ret)
> @@ -794,7 +794,7 @@ retry:
> if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */
> printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
> ne_reset_8390(dev);
> - NS8390_init(dev,1);
> + NS8390p_init(dev,1);
> break;
> }
>
> @@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform_device *pdev)
>
> if (netif_running(dev)) {
> ne_reset_8390(dev);
> - NS8390_init(dev, 1);
> + NS8390p_init(dev, 1);
> netif_device_attach(dev);
> }
> return 0;
> diff --git a/drivers/net/wd.c b/drivers/net/wd.c
> index fa14255..6f9aa16 100644
> --- a/drivers/net/wd.c
> +++ b/drivers/net/wd.c
> @@ -337,7 +337,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
> #ifdef CONFIG_NET_POLL_CONTROLLER
> dev->poll_controller = ei_poll;
> #endif
> - NS8390_init(dev, 0);
> + NS8390p_init(dev, 0);
>
> #if 1
> /* Enable interrupt generation on softconfig cards -- M.U */
> --
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
next prev parent reply other threads:[~2008-07-08 21:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-08 9:22 linux-next: Tree for July 8 Stephen Rothwell
2008-07-08 18:16 ` linux-next: Tree for July 8 (HID) Randy Dunlap
2008-07-09 7:59 ` Jiri Kosina
2008-07-18 22:37 ` Randy Dunlap
2008-07-21 15:55 ` Jiri Kosina
2008-07-08 18:35 ` linux-next: Tree for July 8 (ns8390) Randy Dunlap
2008-07-08 18:30 ` Alan Cox
2008-07-08 18:35 ` Alan Cox
2008-07-08 21:47 ` Randy Dunlap [this message]
2008-07-08 22:48 ` linux-next: Tree for July 8: nx6325-related commits Rafael J. Wysocki
[not found] ` <200807090048.48589.rjw-KKrjLPT3xs0@public.gmane.org>
2008-07-09 14:17 ` Maciej W. Rozycki
[not found] ` <Pine.LNX.4.55.0807091429220.5665-j8+e0ZhYU2SU0huXySazC6sMm+1xrEX8@public.gmane.org>
2008-07-10 11:51 ` Andreas Herrmann
[not found] ` <20080710115102.GB2301-rMjmLWMCR8hKF45tlneXZg@public.gmane.org>
2008-07-11 19:50 ` Maciej W. Rozycki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080708144715.a904d426.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=jgarzik@pobox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox