diff options
| author | Kamil Debski <k.debski@samsung.com> | 2013-07-02 15:53:32 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:43:22 +0900 |
| commit | 291857d7c44a74a8a7dab5a815cbce833a3aba38 (patch) | |
| tree | 49d12a57da60d6cde5dd952bcb3e539a06e378fa /drivers | |
| parent | 4d1b5160df817c626702c1282fecd8c95fa02030 (diff) | |
| download | linux-3.10-291857d7c44a74a8a7dab5a815cbce833a3aba38.tar.gz linux-3.10-291857d7c44a74a8a7dab5a815cbce833a3aba38.tar.bz2 linux-3.10-291857d7c44a74a8a7dab5a815cbce833a3aba38.zip | |
modem_if: Change net device name choice mechanism
CONFIG_SLP is no longer used hence new method of net device names was
implemented.
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/modem_if/sipc4_modem.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/misc/modem_if/sipc4_modem.c b/drivers/misc/modem_if/sipc4_modem.c index 3f22f6a8497..c4cd872526e 100644 --- a/drivers/misc/modem_if/sipc4_modem.c +++ b/drivers/misc/modem_if/sipc4_modem.c @@ -46,6 +46,8 @@ #define RFS_WAKE_TIME (HZ*3) #define RAW_WAKE_TIME (HZ*6) +/* pdp for SLP, rmnet for others */ +#define NET_DEVICE_NAME(n) "pdp"#n /* umts target platform data */ static struct modem_io_t umts_io_devices[] = { @@ -78,33 +80,21 @@ static struct modem_io_t umts_io_devices[] = { .links = LINKTYPE(LINKDEV_HSIC), }, [4] = { -#ifdef CONFIG_SLP - .name = "pdp0", -#else - .name = "rmnet0", -#endif + .name = NET_DEVICE_NAME(0), .id = 0x2A, .format = IPC_RAW, .io_type = IODEV_NET, .links = LINKTYPE(LINKDEV_HSIC), }, [5] = { -#ifdef CONFIG_SLP - .name = "pdp1", -#else - .name = "rmnet1", -#endif + .name = NET_DEVICE_NAME(1) , .id = 0x2B, .format = IPC_RAW, .io_type = IODEV_NET, .links = LINKTYPE(LINKDEV_HSIC), }, [6] = { -#ifdef CONFIG_SLP - .name = "pdp2", -#else - .name = "rmnet2", -#endif + .name = NET_DEVICE_NAME(2), .id = 0x2C, .format = IPC_RAW, .io_type = IODEV_NET, |