iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/bcm2835' and 'asoc/topic/cleanup' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2016-01-11 13:54:34 +00:00
commit e72ceb2aca
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/bcm/bcm2835-i2s.c
View File

@ -31,20 +31,20 @@
* General Public License for more details. * General Public License for more details.
*/ */
#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/dmaengine_pcm.h>
#include <sound/initval.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
/* Clock registers */ /* Clock registers */
#define BCM2835_CLK_PCMCTL_REG 0x00 #define BCM2835_CLK_PCMCTL_REG 0x00

3
sound/soc/codecs/twl6040.c
View File

@ -1097,8 +1097,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
{ {
struct twl6040_data *priv; struct twl6040_data *priv;
struct twl6040 *twl6040 = dev_get_drvdata(codec->dev->parent); struct twl6040 *twl6040 = dev_get_drvdata(codec->dev->parent);
struct platform_device *pdev = container_of(codec->dev, struct platform_device *pdev = to_platform_device(codec->dev);
struct platform_device, dev);
int ret = 0; int ret = 0;
priv = devm_kzalloc(codec->dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(codec->dev, sizeof(*priv), GFP_KERNEL);

3
sound/soc/fsl/mpc8610_hpcd.c
View File

@ -189,8 +189,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
{ {
struct device *dev = pdev->dev.parent; struct device *dev = pdev->dev.parent;
/* ssi_pdev is the platform device for the SSI node that probed us */ /* ssi_pdev is the platform device for the SSI node that probed us */
struct platform_device *ssi_pdev = struct platform_device *ssi_pdev = to_platform_device(dev);
container_of(dev, struct platform_device, dev);
struct device_node *np = ssi_pdev->dev.of_node; struct device_node *np = ssi_pdev->dev.of_node;
struct device_node *codec_np = NULL; struct device_node *codec_np = NULL;
struct mpc8610_hpcd_data *machine_data; struct mpc8610_hpcd_data *machine_data;

3
sound/soc/fsl/p1022_ds.c
View File

@ -199,8 +199,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
{ {
struct device *dev = pdev->dev.parent; struct device *dev = pdev->dev.parent;
/* ssi_pdev is the platform device for the SSI node that probed us */ /* ssi_pdev is the platform device for the SSI node that probed us */
struct platform_device *ssi_pdev = struct platform_device *ssi_pdev = to_platform_device(dev);
container_of(dev, struct platform_device, dev);
struct device_node *np = ssi_pdev->dev.of_node; struct device_node *np = ssi_pdev->dev.of_node;
struct device_node *codec_np = NULL; struct device_node *codec_np = NULL;
struct machine_data *mdata; struct machine_data *mdata;

3
sound/soc/fsl/p1022_rdk.c
View File

@ -203,8 +203,7 @@ static int p1022_rdk_probe(struct platform_device *pdev)
{ {
struct device *dev = pdev->dev.parent; struct device *dev = pdev->dev.parent;
/* ssi_pdev is the platform device for the SSI node that probed us */ /* ssi_pdev is the platform device for the SSI node that probed us */
struct platform_device *ssi_pdev = struct platform_device *ssi_pdev = to_platform_device(dev);
container_of(dev, struct platform_device, dev);
struct device_node *np = ssi_pdev->dev.of_node; struct device_node *np = ssi_pdev->dev.of_node;
struct device_node *codec_np = NULL; struct device_node *codec_np = NULL;
struct machine_data *mdata; struct machine_data *mdata;