Commit 9e554696c03e04c51d095c1c451e26a8cb6a84fa
1 parent
8ac93beaab
Exists in
master
and in
7 other branches
mfd: Use mfd cell platform_data for wl1273 cells platform bits
With the addition of a platform device mfd_cell pointer, MFD drivers can go back to passing platform data back to their sub drivers. This allows for an mfd_cell->mfd_data removal and thus keep the sub drivers MFD agnostic. This is mostly needed for non MFD aware sub drivers. Cc: Matti Aaltonen <matti.j.aaltonen@nokia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Showing 3 changed files with 6 additions and 5 deletions Side-by-side Diff
drivers/media/radio/radio-wl1273.c
| ... | ... | @@ -1990,7 +1990,7 @@ |
| 1990 | 1990 | |
| 1991 | 1991 | static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev) |
| 1992 | 1992 | { |
| 1993 | - struct wl1273_core **core = mfd_get_data(pdev); | |
| 1993 | + struct wl1273_core **core = pdev->dev.platform_data; | |
| 1994 | 1994 | struct wl1273_device *radio; |
| 1995 | 1995 | struct v4l2_ctrl *ctrl; |
| 1996 | 1996 | int r = 0; |
drivers/mfd/wl1273-core.c
| ... | ... | @@ -217,7 +217,8 @@ |
| 217 | 217 | |
| 218 | 218 | cell = &core->cells[children]; |
| 219 | 219 | cell->name = "wl1273_fm_radio"; |
| 220 | - cell->mfd_data = &core; | |
| 220 | + cell->platform_data = &core; | |
| 221 | + cell->pdata_size = sizeof(core); | |
| 221 | 222 | children++; |
| 222 | 223 | |
| 223 | 224 | core->read = wl1273_fm_read_reg; |
| ... | ... | @@ -231,7 +232,8 @@ |
| 231 | 232 | |
| 232 | 233 | dev_dbg(&client->dev, "%s: Have codec.\n", __func__); |
| 233 | 234 | cell->name = "wl1273-codec"; |
| 234 | - cell->mfd_data = &core; | |
| 235 | + cell->platform_data = &core; | |
| 236 | + cell->pdata_size = sizeof(core); | |
| 235 | 237 | children++; |
| 236 | 238 | } |
| 237 | 239 |
sound/soc/codecs/wl1273.c
| ... | ... | @@ -441,8 +441,7 @@ |
| 441 | 441 | |
| 442 | 442 | static int wl1273_probe(struct snd_soc_codec *codec) |
| 443 | 443 | { |
| 444 | - struct wl1273_core **core = | |
| 445 | - mfd_get_data(to_platform_device(codec->dev)); | |
| 444 | + struct wl1273_core **core = codec->dev->platform_data; | |
| 446 | 445 | struct wl1273_priv *wl1273; |
| 447 | 446 | int r; |
| 448 | 447 |