diff options
| author | Kamil Debski <k.debski@samsung.com> | 2013-05-21 18:54:09 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:43:21 +0900 |
| commit | 21d871907b4a0e487a0f9cec1b2cd4a2f5bd808b (patch) | |
| tree | eea8def01a07828dd491b2c180cdbc6df3d10c67 /drivers/misc | |
| parent | 4e33f0ef1cbf4e3272c9e8b3059e825874895d57 (diff) | |
| download | linux-3.10-21d871907b4a0e487a0f9cec1b2cd4a2f5bd808b.tar.gz linux-3.10-21d871907b4a0e487a0f9cec1b2cd4a2f5bd808b.tar.bz2 linux-3.10-21d871907b4a0e487a0f9cec1b2cd4a2f5bd808b.zip | |
modem_if: Modification of the modem driver to compile on the 3.8 kernel
The modem_if driver code was taken from 3.0 kernel and did not compile
on 3.8. These changes are necessary to make the driver work.
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/modem_if/modem_link_device_hsic.c | 4 | ||||
| -rw-r--r-- | drivers/misc/modem_if/modem_net_flowcontrol_device.c | 4 | ||||
| -rw-r--r-- | drivers/misc/modem_if/sipc4_modem.c | 7 | ||||
| -rw-r--r-- | drivers/misc/modem_if/sipc5_modem.c | 7 |
4 files changed, 12 insertions, 10 deletions
diff --git a/drivers/misc/modem_if/modem_link_device_hsic.c b/drivers/misc/modem_if/modem_link_device_hsic.c index bb8066a3fa0..81c732e8159 100644 --- a/drivers/misc/modem_if/modem_link_device_hsic.c +++ b/drivers/misc/modem_if/modem_link_device_hsic.c @@ -1251,7 +1251,7 @@ static int if_usb_set_pipe(struct usb_link_device *usb_ld, return 0; } -static int __devinit if_usb_probe(struct usb_interface *intf, +static int if_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) { int err; @@ -1444,7 +1444,7 @@ MODULE_DEVICE_TABLE(usb, if_usb_ids); static struct usb_driver if_usb_driver = { .name = "cdc_modem", - .probe = if_usb_probe, + .probe = if_usb_probe, .disconnect = if_usb_disconnect, .id_table = if_usb_ids, .suspend = if_usb_suspend, diff --git a/drivers/misc/modem_if/modem_net_flowcontrol_device.c b/drivers/misc/modem_if/modem_net_flowcontrol_device.c index 164f4711c25..4e8b3142cbb 100644 --- a/drivers/misc/modem_if/modem_net_flowcontrol_device.c +++ b/drivers/misc/modem_if/modem_net_flowcontrol_device.c @@ -113,5 +113,5 @@ static int __init modem_net_flowcontrol_device_init(void) module_init(modem_net_flowcontrol_device_init); -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Samsung Modem IF Net Flowcontrol Driver"); +//MODULE_LICENSE("GPL"); +//MODULE_DESCRIPTION("Samsung Modem IF Net Flowcontrol Driver"); diff --git a/drivers/misc/modem_if/sipc4_modem.c b/drivers/misc/modem_if/sipc4_modem.c index 58b3fafaf0c..65d944436cc 100644 --- a/drivers/misc/modem_if/sipc4_modem.c +++ b/drivers/misc/modem_if/sipc4_modem.c @@ -33,6 +33,7 @@ #ifdef CONFIG_HAS_WAKELOCK #include <linux/wakelock.h> #endif +#include <linux/rbtree.h> #include <linux/platform_data/modem.h> #include "modem_prj.h" @@ -119,8 +120,8 @@ static struct io_device *create_io_device(struct modem_io_t *io_t, return NULL; } - rb_init_node(&iod->node_chan); - rb_init_node(&iod->node_fmt); + RB_CLEAR_NODE(&iod->node_chan); + RB_CLEAR_NODE(&iod->node_fmt); iod->name = io_t->name; iod->id = io_t->id; @@ -242,7 +243,7 @@ static int attach_devices(struct io_device *iod, enum modem_link tx_link) return 0; } -static int __devinit modem_probe(struct platform_device *pdev) +static int modem_probe(struct platform_device *pdev) { int i; struct modem_data *pdata = pdev->dev.platform_data; diff --git a/drivers/misc/modem_if/sipc5_modem.c b/drivers/misc/modem_if/sipc5_modem.c index 98987516d02..ccfad5fee3d 100644 --- a/drivers/misc/modem_if/sipc5_modem.c +++ b/drivers/misc/modem_if/sipc5_modem.c @@ -32,6 +32,7 @@ #include <linux/gpio.h> #include <linux/delay.h> #include <linux/wakelock.h> +#include <linux/rbtree.h> #include <linux/platform_data/modem.h> #include "modem_prj.h" @@ -120,8 +121,8 @@ static struct io_device *create_io_device(struct modem_io_t *io_t, return NULL; } - rb_init_node(&iod->node_chan); - rb_init_node(&iod->node_fmt); + RB_CLEAR_NODE(&iod->node_chan); + RB_CLEAR_NODE(&iod->node_fmt); iod->name = io_t->name; iod->id = io_t->id; @@ -228,7 +229,7 @@ static int attach_devices(struct io_device *iod, enum modem_link tx_link) return 0; } -static int __devinit modem_probe(struct platform_device *pdev) +static int modem_probe(struct platform_device *pdev) { int i; struct modem_data *pdata = pdev->dev.platform_data; |