Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.

6 files changed, 638 insertions, 4 deletions

diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 6fdc031daaa..fe9e64d476e 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -29,6 +29,13 @@ config CAN_SJA1000_OF_PLATFORM
           OpenFirmware bindings, e.g. if you have a PowerPC based system
           you may want to enable this option.
 
+config CAN_EMS_PCMCIA
+        tristate "EMS CPC-CARD Card"
+        depends on PCMCIA
+        ---help---
+          This driver is for the one or two channel CPC-CARD cards from
+          EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
+
 config CAN_EMS_PCI
         tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"
         depends on PCI
@@ -37,6 +44,13 @@ config CAN_EMS_PCI
           CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
           (http://www.ems-wuensche.de).
 
+config CAN_PEAK_PCI
+        tristate "PEAK PCAN PCI/PCIe Cards"
+        depends on PCI
+        ---help---
+          This driver is for the PCAN PCI/PCIe cards (1, 2, 3 or 4 channels)
+          from PEAK Systems (http://www.peak-system.com).
+
 config CAN_KVASER_PCI
         tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
         depends on PCI
diff --git a/drivers/net/can/sja1000/Makefile b/drivers/net/can/sja1000/Makefile
index 2c591eb321c..0604f240c8b 100644
--- a/drivers/net/can/sja1000/Makefile
+++ b/drivers/net/can/sja1000/Makefile
@@ -6,8 +6,10 @@ obj-$(CONFIG_CAN_SJA1000) += sja1000.o
 obj-$(CONFIG_CAN_SJA1000_ISA) += sja1000_isa.o
 obj-$(CONFIG_CAN_SJA1000_PLATFORM) += sja1000_platform.o
 obj-$(CONFIG_CAN_SJA1000_OF_PLATFORM) += sja1000_of_platform.o
+obj-$(CONFIG_CAN_EMS_PCMCIA) += ems_pcmcia.o
 obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o
 obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o
+obj-$(CONFIG_CAN_PEAK_PCI) += peak_pci.o
 obj-$(CONFIG_CAN_PLX_PCI) += plx_pci.o
 obj-$(CONFIG_CAN_TSCAN1) += tscan1.o
 
diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c
new file mode 100644
index 00000000000..075a5457a19
--- /dev/null
+++ b/drivers/net/can/sja1000/ems_pcmcia.c
@@ -0,0 +1,331 @@
+/*
+ * Copyright (C) 2008 Sebastian Haas (initial chardev implementation)
+ * Copyright (C) 2010 Markus Plessing <plessing@ems-wuensche.com>
+ * Rework for mainline by Oliver Hartkopp <socketcan@hartkopp.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include "sja1000.h"
+
+#define DRV_NAME "ems_pcmcia"
+
+MODULE_AUTHOR("Markus Plessing <plessing@ems-wuensche.com>");
+MODULE_DESCRIPTION("Socket-CAN driver for EMS CPC-CARD cards");
+MODULE_SUPPORTED_DEVICE("EMS CPC-CARD CAN card");
+MODULE_LICENSE("GPL v2");
+
+#define EMS_PCMCIA_MAX_CHAN 2
+
+struct ems_pcmcia_card {
+        int channels;
+        struct pcmcia_device *pcmcia_dev;
+        struct net_device *net_dev[EMS_PCMCIA_MAX_CHAN];
+        void __iomem *base_addr;
+};
+
+#define EMS_PCMCIA_CAN_CLOCK (16000000 / 2)
+
+/*
+ * The board configuration is probably following:
+ * RX1 is connected to ground.
+ * TX1 is not connected.
+ * CLKO is not connected.
+ * Setting the OCR register to 0xDA is a good idea.
+ * This means  normal output mode , push-pull and the correct polarity.
+ */
+#define EMS_PCMCIA_OCR (OCR_TX0_PUSHPULL | OCR_TX1_PUSHPULL)
+
+/*
+ * In the CDR register, you should set CBP to 1.
+ * You will probably also want to set the clock divider value to 7
+ * (meaning direct oscillator output) because the second SJA1000 chip
+ * is driven by the first one CLKOUT output.
+ */
+#define EMS_PCMCIA_CDR (CDR_CBP | CDR_CLKOUT_MASK)
+#define EMS_PCMCIA_MEM_SIZE 4096 /* Size of the remapped io-memory */
+#define EMS_PCMCIA_CAN_BASE_OFFSET 0x100 /* Offset where controllers starts */
+#define EMS_PCMCIA_CAN_CTRL_SIZE 0x80 /* Memory size for each controller */
+
+#define EMS_CMD_RESET 0x00 /* Perform a reset of the card */
+#define EMS_CMD_MAP   0x03 /* Map CAN controllers into card' memory */
+#define EMS_CMD_UMAP  0x02 /* Unmap CAN controllers from card' memory */
+
+static struct pcmcia_device_id ems_pcmcia_tbl[] = {
+        PCMCIA_DEVICE_PROD_ID123("EMS_T_W", "CPC-Card", "V2.0", 0xeab1ea23,
+                                 0xa338573f, 0xe4575800),
+        PCMCIA_DEVICE_NULL,
+};
+
+MODULE_DEVICE_TABLE(pcmcia, ems_pcmcia_tbl);
+
+static u8 ems_pcmcia_read_reg(const struct sja1000_priv *priv, int port)
+{
+        return readb(priv->reg_base + port);
+}
+
+static void ems_pcmcia_write_reg(const struct sja1000_priv *priv, int port,
+                                 u8 val)
+{
+        writeb(val, priv->reg_base + port);
+}
+
+static irqreturn_t ems_pcmcia_interrupt(int irq, void *dev_id)
+{
+        struct ems_pcmcia_card *card = dev_id;
+        struct net_device *dev;
+        irqreturn_t retval = IRQ_NONE;
+        int i, again;
+
+        /* Card not present */
+        if (readw(card->base_addr) != 0xAA55)
+                return IRQ_HANDLED;
+
+        do {
+                again = 0;
+
+                /* Check interrupt for each channel */
+                for (i = 0; i < card->channels; i++) {
+                        dev = card->net_dev[i];
+                        if (!dev)
+                                continue;
+
+                        if (sja1000_interrupt(irq, dev) == IRQ_HANDLED)
+                                again = 1;
+                }
+                /* At least one channel handled the interrupt */
+                if (again)
+                        retval = IRQ_HANDLED;
+
+        } while (again);
+
+        return retval;
+}
+
+/*
+ * Check if a CAN controller is present at the specified location
+ * by trying to set 'em into the PeliCAN mode
+ */
+static inline int ems_pcmcia_check_chan(struct sja1000_priv *priv)
+{
+        /* Make sure SJA1000 is in reset mode */
+        ems_pcmcia_write_reg(priv, REG_MOD, 1);
+        ems_pcmcia_write_reg(priv, REG_CDR, CDR_PELICAN);
+
+        /* read reset-values */
+        if (ems_pcmcia_read_reg(priv, REG_CDR) == CDR_PELICAN)
+                return 1;
+
+        return 0;
+}
+
+static void ems_pcmcia_del_card(struct pcmcia_device *pdev)
+{
+        struct ems_pcmcia_card *card = pdev->priv;
+        struct net_device *dev;
+        int i;
+
+        free_irq(pdev->irq, card);
+
+        for (i = 0; i < card->channels; i++) {
+                dev = card->net_dev[i];
+                if (!dev)
+                        continue;
+
+                printk(KERN_INFO "%s: removing %s on channel #%d\n",
+                       DRV_NAME, dev->name, i);
+                unregister_sja1000dev(dev);
+                free_sja1000dev(dev);
+        }
+
+        writeb(EMS_CMD_UMAP, card->base_addr);
+        iounmap(card->base_addr);
+        kfree(card);
+
+        pdev->priv = NULL;
+}
+
+/*
+ * Probe PCI device for EMS CAN signature and register each available
+ * CAN channel to SJA1000 Socket-CAN subsystem.
+ */
+static int __devinit ems_pcmcia_add_card(struct pcmcia_device *pdev,
+                                         unsigned long base)
+{
+        struct sja1000_priv *priv;
+        struct net_device *dev;
+        struct ems_pcmcia_card *card;
+        int err, i;
+
+        /* Allocating card structures to hold addresses, ... */
+        card = kzalloc(sizeof(struct ems_pcmcia_card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+
+        pdev->priv = card;
+        card->channels = 0;
+
+        card->base_addr = ioremap(base, EMS_PCMCIA_MEM_SIZE);
+        if (!card->base_addr) {
+                err = -ENOMEM;
+                goto failure_cleanup;
+        }
+
+        /* Check for unique EMS CAN signature */
+        if (readw(card->base_addr) != 0xAA55) {
+                err = -ENODEV;
+                goto failure_cleanup;
+        }
+
+        /* Request board reset */
+        writeb(EMS_CMD_RESET, card->base_addr);
+
+        /* Make sure CAN controllers are mapped into card's memory space */
+        writeb(EMS_CMD_MAP, card->base_addr);
+
+        /* Detect available channels */
+        for (i = 0; i < EMS_PCMCIA_MAX_CHAN; i++) {
+                dev = alloc_sja1000dev(0);
+                if (!dev) {
+                        err = -ENOMEM;
+                        goto failure_cleanup;
+                }
+
+                card->net_dev[i] = dev;
+                priv = netdev_priv(dev);
+                priv->priv = card;
+                SET_NETDEV_DEV(dev, &pdev->dev);
+
+                priv->irq_flags = IRQF_SHARED;
+                dev->irq = pdev->irq;
+                priv->reg_base = card->base_addr + EMS_PCMCIA_CAN_BASE_OFFSET +
+                        (i * EMS_PCMCIA_CAN_CTRL_SIZE);
+
+                /* Check if channel is present */
+                if (ems_pcmcia_check_chan(priv)) {
+                        priv->read_reg  = ems_pcmcia_read_reg;
+                        priv->write_reg = ems_pcmcia_write_reg;
+                        priv->can.clock.freq = EMS_PCMCIA_CAN_CLOCK;
+                        priv->ocr = EMS_PCMCIA_OCR;
+                        priv->cdr = EMS_PCMCIA_CDR;
+                        priv->flags |= SJA1000_CUSTOM_IRQ_HANDLER;
+
+                        /* Register SJA1000 device */
+                        err = register_sja1000dev(dev);
+                        if (err) {
+                                free_sja1000dev(dev);
+                                goto failure_cleanup;
+                        }
+
+                        card->channels++;
+
+                        printk(KERN_INFO "%s: registered %s on channel "
+                               "#%d at 0x%p, irq %d\n", DRV_NAME, dev->name,
+                               i, priv->reg_base, dev->irq);
+                } else
+                        free_sja1000dev(dev);
+        }
+
+        err = request_irq(dev->irq, &ems_pcmcia_interrupt, IRQF_SHARED,
+                          DRV_NAME, card);
+        if (!err)
+                return 0;
+
+failure_cleanup:
+        ems_pcmcia_del_card(pdev);
+        return err;
+}
+
+/*
+ * Setup PCMCIA socket and probe for EMS CPC-CARD
+ */
+static int __devinit ems_pcmcia_probe(struct pcmcia_device *dev)
+{
+        int csval;
+
+        /* General socket configuration */
+        dev->config_flags |= CONF_ENABLE_IRQ;
+        dev->config_index = 1;
+        dev->config_regs = PRESENT_OPTION;
+
+        /* The io structure describes IO port mapping */
+        dev->resource[0]->end = 16;
+        dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        dev->resource[1]->end = 16;
+        dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_16;
+        dev->io_lines = 5;
+
+        /* Allocate a memory window */
+        dev->resource[2]->flags =
+                (WIN_DATA_WIDTH_8 | WIN_MEMORY_TYPE_CM | WIN_ENABLE);
+        dev->resource[2]->start = dev->resource[2]->end = 0;
+
+        csval = pcmcia_request_window(dev, dev->resource[2], 0);
+        if (csval) {
+                dev_err(&dev->dev, "pcmcia_request_window failed (err=%d)\n",
+                        csval);
+                return 0;
+        }
+
+        csval = pcmcia_map_mem_page(dev, dev->resource[2], dev->config_base);
+        if (csval) {
+                dev_err(&dev->dev, "pcmcia_map_mem_page failed (err=%d)\n",
+                        csval);
+                return 0;
+        }
+
+        csval = pcmcia_enable_device(dev);
+        if (csval) {
+                dev_err(&dev->dev, "pcmcia_enable_device failed (err=%d)\n",
+                        csval);
+                return 0;
+        }
+
+        ems_pcmcia_add_card(dev, dev->resource[2]->start);
+        return 0;
+}
+
+/*
+ * Release claimed resources
+ */
+static void ems_pcmcia_remove(struct pcmcia_device *dev)
+{
+        ems_pcmcia_del_card(dev);
+        pcmcia_disable_device(dev);
+}
+
+static struct pcmcia_driver ems_pcmcia_driver = {
+        .name = DRV_NAME,
+        .probe = ems_pcmcia_probe,
+        .remove = ems_pcmcia_remove,
+        .id_table = ems_pcmcia_tbl,
+};
+
+static int __init ems_pcmcia_init(void)
+{
+        return pcmcia_register_driver(&ems_pcmcia_driver);
+}
+module_init(ems_pcmcia_init);
+
+static void __exit ems_pcmcia_exit(void)
+{
+        pcmcia_unregister_driver(&ems_pcmcia_driver);
+}
+module_exit(ems_pcmcia_exit);
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
new file mode 100644
index 00000000000..905bce0b3a4
--- /dev/null
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
+ *
+ * Derived from the PCAN project file driver/src/pcan_pci.c:
+ *
+ * Copyright (C) 2001-2006  PEAK System-Technik GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/io.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+
+#include "sja1000.h"
+
+MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
+MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI/PCIe cards");
+MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe CAN card");
+MODULE_LICENSE("GPL v2");
+
+#define DRV_NAME  "peak_pci"
+
+struct peak_pci_chan {
+        void __iomem *cfg_base;      /* Common for all channels */
+        struct net_device *next_dev; /* Chain of network devices */
+        u16 icr_mask;                /* Interrupt mask for fast ack */
+};
+
+#define PEAK_PCI_CAN_CLOCK      (16000000 / 2)
+
+#define PEAK_PCI_CDR            (CDR_CBP | CDR_CLKOUT_MASK)
+#define PEAK_PCI_OCR            OCR_TX0_PUSHPULL
+
+/*
+ * Important PITA registers
+ */
+#define PITA_ICR                0x00    /* Interrupt control register */
+#define PITA_GPIOICR            0x18    /* GPIO interface control register */
+#define PITA_MISC               0x1C    /* Miscellaneous register */
+
+#define PEAK_PCI_CFG_SIZE       0x1000  /* Size of the config PCI bar */
+#define PEAK_PCI_CHAN_SIZE      0x0400  /* Size used by the channel */
+
+#define PEAK_PCI_VENDOR_ID      0x001C  /* The PCI device and vendor IDs */
+#define PEAK_PCI_DEVICE_ID      0x0001  /* for PCI/PCIe slot cards */
+
+static const u16 peak_pci_icr_masks[] = {0x02, 0x01, 0x40, 0x80};
+
+static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = {
+        {PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+        {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, peak_pci_tbl);
+
+static u8 peak_pci_read_reg(const struct sja1000_priv *priv, int port)
+{
+        return readb(priv->reg_base + (port << 2));
+}
+
+static void peak_pci_write_reg(const struct sja1000_priv *priv,
+                               int port, u8 val)
+{
+        writeb(val, priv->reg_base + (port << 2));
+}
+
+static void peak_pci_post_irq(const struct sja1000_priv *priv)
+{
+        struct peak_pci_chan *chan = priv->priv;
+        u16 icr;
+
+        /* Select and clear in PITA stored interrupt */
+        icr = readw(chan->cfg_base + PITA_ICR);
+        if (icr & chan->icr_mask)
+                writew(chan->icr_mask, chan->cfg_base + PITA_ICR);
+}
+
+static int __devinit peak_pci_probe(struct pci_dev *pdev,
+                                    const struct pci_device_id *ent)
+{
+        struct sja1000_priv *priv;
+        struct peak_pci_chan *chan;
+        struct net_device *dev, *dev0 = NULL;
+        void __iomem *cfg_base, *reg_base;
+        u16 sub_sys_id, icr;
+        int i, err, channels;
+
+        err = pci_enable_device(pdev);
+        if (err)
+                return err;
+
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err)
+                goto failure_disable_pci;
+
+        err = pci_read_config_word(pdev, 0x2e, &sub_sys_id);
+        if (err)
+                goto failure_release_regions;
+
+        dev_dbg(&pdev->dev, "probing device %04x:%04x:%04x\n",
+                pdev->vendor, pdev->device, sub_sys_id);
+
+        err = pci_write_config_word(pdev, 0x44, 0);
+        if (err)
+                goto failure_release_regions;
+
+        if (sub_sys_id >= 12)
+                channels = 4;
+        else if (sub_sys_id >= 10)
+                channels = 3;
+        else if (sub_sys_id >= 4)
+                channels = 2;
+        else
+                channels = 1;
+
+        cfg_base = pci_iomap(pdev, 0, PEAK_PCI_CFG_SIZE);
+        if (!cfg_base) {
+                dev_err(&pdev->dev, "failed to map PCI resource #0\n");
+                goto failure_release_regions;
+        }
+
+        reg_base = pci_iomap(pdev, 1, PEAK_PCI_CHAN_SIZE * channels);
+        if (!reg_base) {
+                dev_err(&pdev->dev, "failed to map PCI resource #1\n");
+                goto failure_unmap_cfg_base;
+        }
+
+        /* Set GPIO control register */
+        writew(0x0005, cfg_base + PITA_GPIOICR + 2);
+        /* Enable all channels of this card */
+        writeb(0x00, cfg_base + PITA_GPIOICR);
+        /* Toggle reset */
+        writeb(0x05, cfg_base + PITA_MISC + 3);
+        mdelay(5);
+        /* Leave parport mux mode */
+        writeb(0x04, cfg_base + PITA_MISC + 3);
+
+        icr = readw(cfg_base + PITA_ICR + 2);
+
+        for (i = 0; i < channels; i++) {
+                dev = alloc_sja1000dev(sizeof(struct peak_pci_chan));
+                if (!dev) {
+                        err = -ENOMEM;
+                        goto failure_remove_channels;
+                }
+
+                priv = netdev_priv(dev);
+                chan = priv->priv;
+
+                chan->cfg_base = cfg_base;
+                priv->reg_base = reg_base + i * PEAK_PCI_CHAN_SIZE;
+
+                priv->read_reg = peak_pci_read_reg;
+                priv->write_reg = peak_pci_write_reg;
+                priv->post_irq = peak_pci_post_irq;
+
+                priv->can.clock.freq = PEAK_PCI_CAN_CLOCK;
+                priv->ocr = PEAK_PCI_OCR;
+                priv->cdr = PEAK_PCI_CDR;
+                /* Neither a slave nor a single device distributes the clock */
+                if (channels == 1 || i > 0)
+                        priv->cdr |= CDR_CLK_OFF;
+
+                /* Setup interrupt handling */
+                priv->irq_flags = IRQF_SHARED;
+                dev->irq = pdev->irq;
+
+                chan->icr_mask = peak_pci_icr_masks[i];
+                icr |= chan->icr_mask;
+
+                SET_NETDEV_DEV(dev, &pdev->dev);
+
+                err = register_sja1000dev(dev);
+                if (err) {
+                        dev_err(&pdev->dev, "failed to register device\n");
+                        free_sja1000dev(dev);
+                        goto failure_remove_channels;
+                }
+
+                /* Create chain of SJA1000 devices */
+                if (i == 0)
+                        dev0 = dev;
+                else
+                        chan->next_dev = dev;
+
+                dev_info(&pdev->dev,
+                         "%s at reg_base=0x%p cfg_base=0x%p irq=%d\n",
+                         dev->name, priv->reg_base, chan->cfg_base, dev->irq);
+        }
+
+        pci_set_drvdata(pdev, dev0);
+
+        /* Enable interrupts */
+        writew(icr, cfg_base + PITA_ICR + 2);
+
+        return 0;
+
+failure_remove_channels:
+        /* Disable interrupts */
+        writew(0x0, cfg_base + PITA_ICR + 2);
+
+        for (dev = dev0; dev; dev = chan->next_dev) {
+                unregister_sja1000dev(dev);
+                free_sja1000dev(dev);
+                priv = netdev_priv(dev);
+                chan = priv->priv;
+                dev = chan->next_dev;
+        }
+
+        pci_iounmap(pdev, reg_base);
+
+failure_unmap_cfg_base:
+        pci_iounmap(pdev, cfg_base);
+
+failure_release_regions:
+        pci_release_regions(pdev);
+
+failure_disable_pci:
+        pci_disable_device(pdev);
+
+        return err;
+}
+
+static void __devexit peak_pci_remove(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev); /* First device */
+        struct sja1000_priv *priv = netdev_priv(dev);
+        struct peak_pci_chan *chan = priv->priv;
+        void __iomem *cfg_base = chan->cfg_base;
+        void __iomem *reg_base = priv->reg_base;
+
+        /* Disable interrupts */
+        writew(0x0, cfg_base + PITA_ICR + 2);
+
+        /* Loop over all registered devices */
+        while (1) {
+                dev_info(&pdev->dev, "removing device %s\n", dev->name);
+                unregister_sja1000dev(dev);
+                free_sja1000dev(dev);
+                dev = chan->next_dev;
+                if (!dev)
+                        break;
+                priv = netdev_priv(dev);
+                chan = priv->priv;
+        }
+
+        pci_iounmap(pdev, reg_base);
+        pci_iounmap(pdev, cfg_base);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+
+        pci_set_drvdata(pdev, NULL);
+}
+
+static struct pci_driver peak_pci_driver = {
+        .name = DRV_NAME,
+        .id_table = peak_pci_tbl,
+        .probe = peak_pci_probe,
+        .remove = __devexit_p(peak_pci_remove),
+};
+
+static int __init peak_pci_init(void)
+{
+        return pci_register_driver(&peak_pci_driver);
+}
+module_init(peak_pci_init);
+
+static void __exit peak_pci_exit(void)
+{
+        pci_unregister_driver(&peak_pci_driver);
+}
+module_exit(peak_pci_exit);
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index f501bba1fc6..04a3f1b756a 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -40,8 +40,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h
index 78bd4ecac14..23fff06875f 100644
--- a/drivers/net/can/sja1000/sja1000.h
+++ b/drivers/net/can/sja1000/sja1000.h
@@ -40,8 +40,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef SJA1000_DEV_H