diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-14 15:43:54 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:51 +0200 |
commit | 0c4dfa259706926d235633697b64c4331ee190ed (patch) | |
tree | fca6071f82c9f8133acee0ed19d337861d1e2544 /drivers | |
parent | 1830023a6aff95f3bd619a001ccbbe5065c273b1 (diff) |
staging: cg2900: Update for api change in 3.0
Add missing header file
Change-Id: I2e8b87b9b5de26e741374eb11b93f15cfa37d826
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/cg2900/bluetooth/btcg2900.c | 4 | ||||
-rw-r--r-- | drivers/staging/cg2900/bluetooth/hci_ldisc.c | 2 | ||||
-rw-r--r-- | drivers/staging/cg2900/mfd/cg2900_char_devices.c | 2 | ||||
-rw-r--r-- | drivers/staging/cg2900/mfd/cg2900_chip.c | 46 | ||||
-rw-r--r-- | drivers/staging/cg2900/mfd/stlc2690_chip.c | 22 |
5 files changed, 38 insertions, 38 deletions
diff --git a/drivers/staging/cg2900/bluetooth/btcg2900.c b/drivers/staging/cg2900/bluetooth/btcg2900.c index 9c1c4413087..0eb39523c1e 100644 --- a/drivers/staging/cg2900/bluetooth/btcg2900.c +++ b/drivers/staging/cg2900/bluetooth/btcg2900.c @@ -913,7 +913,7 @@ static int probe_common(struct platform_device *pdev, dev_set_drvdata(dev, info); - pf_data = mfd_get_data(pdev); + pf_data = mfd_get_cell(pdev)->platform_data; pf_data->dev = dev; pf_data->read_cb = hci_read_cb; pf_data->reset_cb = hci_reset_cb; @@ -1051,7 +1051,7 @@ static int remove_common(struct platform_device *pdev, struct cg2900_user_data *pf_data; struct dev_info *dev_info; - pf_data = mfd_get_data(pdev); + pf_data = mfd_get_cell(pdev)->platform_data; dev_info = cg2900_get_usr(pf_data); kfree(dev_info); diff --git a/drivers/staging/cg2900/bluetooth/hci_ldisc.c b/drivers/staging/cg2900/bluetooth/hci_ldisc.c index d7ff9d419a1..bb480317f6d 100644 --- a/drivers/staging/cg2900/bluetooth/hci_ldisc.c +++ b/drivers/staging/cg2900/bluetooth/hci_ldisc.c @@ -206,7 +206,7 @@ int cg2900_hci_uart_tiocmget(struct hci_uart *hu) if (!tty->ops->tiocmget || !hu->fd) return -EOPNOTSUPP; - return tty->ops->tiocmget(tty, hu->fd); + return tty->ops->tiocmget(tty); } void cg2900_hci_uart_flush_buffer(struct hci_uart *hu) diff --git a/drivers/staging/cg2900/mfd/cg2900_char_devices.c b/drivers/staging/cg2900/mfd/cg2900_char_devices.c index c7bacdf8889..0f1627e82ac 100644 --- a/drivers/staging/cg2900/mfd/cg2900_char_devices.c +++ b/drivers/staging/cg2900/mfd/cg2900_char_devices.c @@ -549,7 +549,7 @@ static int __devinit cg2900_char_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "cg2900_char_probe\n"); - user = mfd_get_data(pdev); + user = mfd_get_cell(pdev)->platform_data; user->dev = dev; user->read_cb = char_dev_read_cb; user->reset_cb = char_dev_reset_cb; diff --git a/drivers/staging/cg2900/mfd/cg2900_chip.c b/drivers/staging/cg2900/mfd/cg2900_chip.c index ad42429d5f0..fa243dcab15 100644 --- a/drivers/staging/cg2900/mfd/cg2900_chip.c +++ b/drivers/staging/cg2900/mfd/cg2900_chip.c @@ -2937,47 +2937,47 @@ static struct cg2900_user_data audio_fm_data = { static struct mfd_cell cg2900_devs[] = { { .name = "cg2900-btcmd", - .mfd_data = &btcmd_data, + .platform_data = &btcmd_data, }, { .name = "cg2900-btacl", - .mfd_data = &btacl_data, + .platform_data = &btacl_data, }, { .name = "cg2900-btevt", - .mfd_data = &btevt_data, + .platform_data = &btevt_data, }, { .name = "cg2900-fm", - .mfd_data = &fm_data, + .platform_data = &fm_data, }, { .name = "cg2900-gnss", - .mfd_data = &gnss_data, + .platform_data = &gnss_data, }, { .name = "cg2900-debug", - .mfd_data = &debug_data, + .platform_data = &debug_data, }, { .name = "cg2900-stetools", - .mfd_data = &ste_tools_data, + .platform_data = &ste_tools_data, }, { .name = "cg2900-hcilogger", - .mfd_data = &hci_logger_data, + .platform_data = &hci_logger_data, }, { .name = "cg2900-core", - .mfd_data = &core_data, + .platform_data = &core_data, }, { .name = "cg2900-audiobt", - .mfd_data = &audio_bt_data, + .platform_data = &audio_bt_data, }, { .name = "cg2900-audiofm", - .mfd_data = &audio_fm_data, + .platform_data = &audio_fm_data, }, }; @@ -3059,57 +3059,57 @@ static struct mfd_cell cg2900_char_devs[] = { { .name = "cg2900-chardev", .id = 0, - .mfd_data = &char_btcmd_data, + .platform_data = &char_btcmd_data, }, { .name = "cg2900-chardev", .id = 1, - .mfd_data = &char_btacl_data, + .platform_data = &char_btacl_data, }, { .name = "cg2900-chardev", .id = 2, - .mfd_data = &char_btevt_data, + .platform_data = &char_btevt_data, }, { .name = "cg2900-chardev", .id = 3, - .mfd_data = &char_fm_data, + .platform_data = &char_fm_data, }, { .name = "cg2900-chardev", .id = 4, - .mfd_data = &char_gnss_data, + .platform_data = &char_gnss_data, }, { .name = "cg2900-chardev", .id = 5, - .mfd_data = &char_debug_data, + .platform_data = &char_debug_data, }, { .name = "cg2900-chardev", .id = 6, - .mfd_data = &char_ste_tools_data, + .platform_data = &char_ste_tools_data, }, { .name = "cg2900-chardev", .id = 7, - .mfd_data = &char_hci_logger_data, + .platform_data = &char_hci_logger_data, }, { .name = "cg2900-chardev", .id = 8, - .mfd_data = &char_core_data, + .platform_data = &char_core_data, }, { .name = "cg2900-chardev", .id = 9, - .mfd_data = &char_audio_bt_data, + .platform_data = &char_audio_bt_data, }, { .name = "cg2900-chardev", .id = 10, - .mfd_data = &char_audio_fm_data, + .platform_data = &char_audio_fm_data, }, }; @@ -3122,7 +3122,7 @@ static struct mfd_cell cg2900_char_devs[] = { */ static void set_plat_data(struct mfd_cell *cell, struct cg2900_chip_dev *dev) { - struct cg2900_user_data *pf_data = cell->mfd_data; + struct cg2900_user_data *pf_data = cell->platform_data; if (!pf_data->open) pf_data->open = cg2900_open; diff --git a/drivers/staging/cg2900/mfd/stlc2690_chip.c b/drivers/staging/cg2900/mfd/stlc2690_chip.c index 47d0cf1c0e5..3e394670f1f 100644 --- a/drivers/staging/cg2900/mfd/stlc2690_chip.c +++ b/drivers/staging/cg2900/mfd/stlc2690_chip.c @@ -1293,23 +1293,23 @@ static struct cg2900_user_data core_data = { static struct mfd_cell stlc2690_devs[] = { { .name = "cg2900-btcmd", - .mfd_data = &btcmd_data, + .platform_data = &btcmd_data, }, { .name = "cg2900-btacl", - .mfd_data = &btacl_data, + .platform_data = &btacl_data, }, { .name = "cg2900-btevt", - .mfd_data = &btevt_data, + .platform_data = &btevt_data, }, { .name = "cg2900-hcilogger", - .mfd_data = &hci_logger_data, + .platform_data = &hci_logger_data, }, { .name = "cg2900-core", - .mfd_data = &core_data, + .platform_data = &core_data, }, }; @@ -1353,27 +1353,27 @@ static struct mfd_cell stlc2690_char_devs[] = { { .name = "cg2900-chardev", .id = 0, - .mfd_data = &char_btcmd_data, + .platform_data = &char_btcmd_data, }, { .name = "cg2900-chardev", .id = 1, - .mfd_data = &char_btacl_data, + .platform_data = &char_btacl_data, }, { .name = "cg2900-chardev", .id = 2, - .mfd_data = &char_btevt_data, + .platform_data = &char_btevt_data, }, { .name = "cg2900-chardev", .id = 7, - .mfd_data = &char_hci_logger_data, + .platform_data = &char_hci_logger_data, }, { .name = "cg2900-chardev", .id = 8, - .mfd_data = &char_core_data, + .platform_data = &char_core_data, }, }; @@ -1386,7 +1386,7 @@ static struct mfd_cell stlc2690_char_devs[] = { */ static void set_plat_data(struct mfd_cell *cell, struct cg2900_chip_dev *dev) { - struct cg2900_user_data *user = cell->mfd_data; + struct cg2900_user_data *user = cell->platform_data; if (!user->open) user->open = stlc2690_open; |