aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_utils.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-03-16 16:56:41 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-01 11:28:27 +0100
commit8f549d7e7795e5e07ff871a79708bf2e387104dd (patch)
tree93de6a8ffba13bf6613c4a08875b3cbed97d1697 /sound/soc/fsl/fsl_utils.c
parent60aae8da298e3ac0af07c8cdb6a98e47e8deab35 (diff)
ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name
The ASoC core now can support matching codec with device node besides name, so we can save helper function fsl_asoc_get_codec_dev_name. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/fsl_utils.c')
-rw-r--r--sound/soc/fsl/fsl_utils.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
index 4370c28e536..b9e42b503a3 100644
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
@@ -12,55 +12,11 @@
#include <linux/module.h>
#include <linux/of_address.h>
-#include <linux/of_i2c.h>
#include <sound/soc.h>
#include "fsl_utils.h"
/**
- * fsl_asoc_get_codec_dev_name - determine the dev_name for a codec node
- *
- * @np: pointer to the I2C device tree node
- * @buf: buffer to be filled with the dev_name of the I2C device
- * @len: the length of the buffer
- *
- * This function determines the dev_name for an I2C node. This is the name
- * that would be returned by dev_name() if this device_node were part of a
- * 'struct device' It's ugly and hackish, but it works.
- *
- * The dev_name for such devices include the bus number and I2C address. For
- * example, "cs4270.0-004f".
- */
-int fsl_asoc_get_codec_dev_name(struct device_node *np, char *buf, size_t len)
-{
- const u32 *iprop;
- u32 addr;
- char temp[DAI_NAME_SIZE];
- struct i2c_client *i2c;
-
- of_modalias_node(np, temp, DAI_NAME_SIZE);
-
- iprop = of_get_property(np, "reg", NULL);
- if (!iprop)
- return -EINVAL;
-
- addr = be32_to_cpup(iprop);
-
- /* We need the adapter number */
- i2c = of_find_i2c_device_by_node(np);
- if (!i2c) {
- put_device(&i2c->dev);
- return -ENODEV;
- }
-
- snprintf(buf, len, "%s.%u-%04x", temp, i2c->adapter->nr, addr);
- put_device(&i2c->dev);
-
- return 0;
-}
-EXPORT_SYMBOL(fsl_asoc_get_codec_dev_name);
-
-/**
* fsl_asoc_get_dma_channel - determine the dma channel for a SSI node
*
* @ssi_np: pointer to the SSI device tree node