Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

3 files changed, 31 insertions, 11 deletions

diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 36e9d594069d..b21523ddff3c 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -71,6 +71,7 @@ config CAN_PLX_PCI
            - esd CAN-PCIe/2000
            - Marathon CAN-bus-PCI card (http://www.marathon.ru/)
            - TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/)
+           - IXXAT Automation PC-I 04/PCI card (http://www.ixxat.com/)
 
 config CAN_TSCAN1
         tristate "TS-CAN1 PC104 boards"
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index c7f3d4ea1167..a227586ddd52 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -43,7 +43,8 @@ MODULE_SUPPORTED_DEVICE("Adlink PCI-7841/cPCI-7841, "
                         "TEWS TECHNOLOGIES TPMC810, "
                         "esd CAN-PCI/CPCI/PCI104/200, "
                         "esd CAN-PCI/PMC/266, "
-                        "esd CAN-PCIe/2000")
+                        "esd CAN-PCIe/2000, "
+                        "IXXAT PC-I 04/PCI")
 MODULE_LICENSE("GPL v2");
 
 #define PLX_PCI_MAX_CHAN 2
@@ -121,6 +122,10 @@ struct plx_pci_card {
 #define ESD_PCI_SUB_SYS_ID_PCIE2000     0x0200
 #define ESD_PCI_SUB_SYS_ID_PCI104200    0x0501
 
+#define IXXAT_PCI_VENDOR_ID             0x10b5
+#define IXXAT_PCI_DEVICE_ID             0x9050
+#define IXXAT_PCI_SUB_SYS_ID            0x2540
+
 #define MARATHON_PCI_DEVICE_ID          0x2715
 
 #define TEWS_PCI_VENDOR_ID              0x1498
@@ -193,6 +198,14 @@ static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = {
         /* based on PEX8311 */
 };
 
+static struct plx_pci_card_info plx_pci_card_info_ixxat __devinitdata = {
+        "IXXAT PC-I 04/PCI", 2,
+        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
+        {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x200, 0x80} },
+        &plx_pci_reset_common
+        /* based on PLX9050 */
+};
+
 static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = {
         "Marathon CAN-bus-PCI", 2,
         PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
@@ -267,6 +280,13 @@ static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
                 (kernel_ulong_t)&plx_pci_card_info_esd2000
         },
         {
+                /* IXXAT PC-I 04/PCI card */
+                IXXAT_PCI_VENDOR_ID, IXXAT_PCI_DEVICE_ID,
+                PCI_ANY_ID, IXXAT_PCI_SUB_SYS_ID,
+                0, 0,
+                (kernel_ulong_t)&plx_pci_card_info_ixxat
+        },
+        {
                 /* Marathon CAN-bus-PCI card */
                 PCI_VENDOR_ID_PLX, MARATHON_PCI_DEVICE_ID,
                 PCI_ANY_ID, PCI_ANY_ID,
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 04a3f1b756a8..ebbcfcafe29b 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -128,7 +128,7 @@ static void set_reset_mode(struct net_device *dev)
                 status = priv->read_reg(priv, REG_MOD);
         }
 
-        dev_err(dev->dev.parent, "setting SJA1000 into reset mode failed!\n");
+        netdev_err(dev, "setting SJA1000 into reset mode failed!\n");
 }
 
 static void set_normal_mode(struct net_device *dev)
@@ -156,7 +156,7 @@ static void set_normal_mode(struct net_device *dev)
                 status = priv->read_reg(priv, REG_MOD);
         }
 
-        dev_err(dev->dev.parent, "setting SJA1000 into normal mode failed!\n");
+        netdev_err(dev, "setting SJA1000 into normal mode failed!\n");
 }
 
 static void sja1000_start(struct net_device *dev)
@@ -209,8 +209,7 @@ static int sja1000_set_bittiming(struct net_device *dev)
         if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                 btr1 |= 0x80;
 
-        dev_info(dev->dev.parent,
-                 "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
+        netdev_info(dev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
         priv->write_reg(priv, REG_BTR0, btr0);
         priv->write_reg(priv, REG_BTR1, btr1);
@@ -378,7 +377,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
         if (isrc & IRQ_DOI) {
                 /* data overrun interrupt */
-                dev_dbg(dev->dev.parent, "data overrun interrupt\n");
+                netdev_dbg(dev, "data overrun interrupt\n");
                 cf->can_id |= CAN_ERR_CRTL;
                 cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
                 stats->rx_over_errors++;
@@ -388,7 +387,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
         if (isrc & IRQ_EI) {
                 /* error warning interrupt */
-                dev_dbg(dev->dev.parent, "error warning interrupt\n");
+                netdev_dbg(dev, "error warning interrupt\n");
 
                 if (status & SR_BS) {
                         state = CAN_STATE_BUS_OFF;
@@ -429,7 +428,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
         }
         if (isrc & IRQ_EPI) {
                 /* error passive interrupt */
-                dev_dbg(dev->dev.parent, "error passive interrupt\n");
+                netdev_dbg(dev, "error passive interrupt\n");
                 if (status & SR_ES)
                         state = CAN_STATE_ERROR_PASSIVE;
                 else
@@ -437,7 +436,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
         }
         if (isrc & IRQ_ALI) {
                 /* arbitration lost interrupt */
-                dev_dbg(dev->dev.parent, "arbitration lost interrupt\n");
+                netdev_dbg(dev, "arbitration lost interrupt\n");
                 alc = priv->read_reg(priv, REG_ALC);
                 priv->can.can_stats.arbitration_lost++;
                 stats->tx_errors++;
@@ -495,7 +494,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                 status = priv->read_reg(priv, REG_SR);
 
                 if (isrc & IRQ_WUI)
-                        dev_warn(dev->dev.parent, "wakeup interrupt\n");
+                        netdev_warn(dev, "wakeup interrupt\n");
 
                 if (isrc & IRQ_TI) {
                         /* transmission complete interrupt */
@@ -522,7 +521,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                 priv->post_irq(priv);
 
         if (n >= SJA1000_MAX_IRQ)
-                dev_dbg(dev->dev.parent, "%d messages handled in ISR", n);
+                netdev_dbg(dev, "%d messages handled in ISR", n);
 
         return (n) ? IRQ_HANDLED : IRQ_NONE;
 }