← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/can/janz-ican3.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/can/janz-ican3.c
15
15
#include <linux/interrupt.h>
16
16
#include <linux/delay.h>
17
17
#include <linux/platform_device.h>
18
 
#include <linux/mfd/core.h>
19
18
 
20
19
#include <linux/netdevice.h>
21
20
#include <linux/can.h>
274
273
 */
275
274
 
276
275
/*
277
 
 * Recieve a message from the ICAN3 "old-style" firmware interface
 
276
 * Receive a message from the ICAN3 "old-style" firmware interface
278
277
 *
279
278
 * LOCKING: must hold mod->lock
280
279
 *
1050
1049
                complete(&mod->termination_comp);
1051
1050
                break;
1052
1051
        default:
1053
 
                dev_err(mod->dev, "recieved an unknown inquiry response\n");
 
1052
                dev_err(mod->dev, "received an unknown inquiry response\n");
1054
1053
                break;
1055
1054
        }
1056
1055
}
1058
1057
static void ican3_handle_unknown_message(struct ican3_dev *mod,
1059
1058
                                        struct ican3_msg *msg)
1060
1059
{
1061
 
        dev_warn(mod->dev, "recieved unknown message: spec 0x%.2x length %d\n",
 
1060
        dev_warn(mod->dev, "received unknown message: spec 0x%.2x length %d\n",
1062
1061
                           msg->spec, le16_to_cpu(msg->len));
1063
1062
}
1064
1063
 
1113
1112
}
1114
1113
 
1115
1114
/*
1116
 
 * Recieve one CAN frame from the hardware
 
1115
 * Receive one CAN frame from the hardware
1117
1116
 *
1118
1117
 * CONTEXT: must be called from user context
1119
1118
 */
1644
1643
        struct device *dev;
1645
1644
        int ret;
1646
1645
 
1647
 
        pdata = mfd_get_data(pdev);
 
1646
        pdata = pdev->dev.platform_data;
1648
1647
        if (!pdata)
1649
1648
                return -ENXIO;
1650
1649