[v1,2/3] ASoC: rt5677: Use device_get_match_data()
Commit Message
Use device_get_match_data() to simplify the code.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
sound/soc/codecs/rt5677.c | 21 ++++-----------------
sound/soc/codecs/rt5677.h | 4 ++--
2 files changed, 6 insertions(+), 19 deletions(-)
Comments
On Thu, Jun 29, 2023 at 01:46:02PM +0300, Andy Shevchenko wrote:
> + rt5677->type = (enum rt5677_type)(uintptr_t)device_get_match_data(dev);
Double casts, always a sign of a successful simplification! :P
> + if (rt5677->type == 0)
> return -EINVAL;
> - }
>
> rt5677_read_device_properties(rt5677, &i2c->dev);
>
> @@ -5702,7 +5689,7 @@ static struct i2c_driver rt5677_i2c_driver = {
> .driver = {
> .name = RT5677_DRV_NAME,
> .of_match_table = rt5677_of_match,
> - .acpi_match_table = ACPI_PTR(rt5677_acpi_match),
> + .acpi_match_table = rt5677_acpi_match,
> },
> .probe = rt5677_i2c_probe,
> .remove = rt5677_i2c_remove,
> diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h
> index 944ae02aafc2..5ccdf1ba613a 100644
> --- a/sound/soc/codecs/rt5677.h
> +++ b/sound/soc/codecs/rt5677.h
> @@ -1753,8 +1753,8 @@ enum {
> };
>
> enum rt5677_type {
> - RT5677,
> - RT5676,
> + RT5677 = 1,
> + RT5676 = 2,
> };
>
> /* ASRC clock source selection */
> --
> 2.40.0.1.gaa8946217a0b
>
On Thu, Jun 29, 2023 at 11:56:10AM +0100, Mark Brown wrote:
> On Thu, Jun 29, 2023 at 01:46:02PM +0300, Andy Shevchenko wrote:
...
> > + rt5677->type = (enum rt5677_type)(uintptr_t)device_get_match_data(dev);
> Double casts, always a sign of a successful simplification! :P
Unfortunate of the C language and use of plain numbers when
pointers are required. :-( I feel your pain.
> > + if (rt5677->type == 0)
> > return -EINVAL;
> > - }
I would prefer to see in the ID table something like
.compatible = "foo", .data = &codec[RT5677],
but in this driver it seems it will require quite a refactoring.
@@ -6,7 +6,6 @@
* Author: Oder Chiou <oder_chiou@realtek.com>
*/
-#include <linux/acpi.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
@@ -18,7 +17,6 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/firmware.h>
-#include <linux/of_device.h>
#include <linux/property.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
@@ -5559,6 +5557,7 @@ static int rt5677_init_irq(struct i2c_client *i2c)
static int rt5677_i2c_probe(struct i2c_client *i2c)
{
+ struct device *dev = &i2c->dev;
struct rt5677_priv *rt5677;
int ret;
unsigned int val;
@@ -5573,21 +5572,9 @@ static int rt5677_i2c_probe(struct i2c_client *i2c)
INIT_DELAYED_WORK(&rt5677->dsp_work, rt5677_dsp_work);
i2c_set_clientdata(i2c, rt5677);
- if (i2c->dev.of_node) {
- const struct of_device_id *match_id;
-
- match_id = of_match_device(rt5677_of_match, &i2c->dev);
- if (match_id)
- rt5677->type = (enum rt5677_type)match_id->data;
- } else if (ACPI_HANDLE(&i2c->dev)) {
- const struct acpi_device_id *acpi_id;
-
- acpi_id = acpi_match_device(rt5677_acpi_match, &i2c->dev);
- if (acpi_id)
- rt5677->type = (enum rt5677_type)acpi_id->driver_data;
- } else {
+ rt5677->type = (enum rt5677_type)(uintptr_t)device_get_match_data(dev);
+ if (rt5677->type == 0)
return -EINVAL;
- }
rt5677_read_device_properties(rt5677, &i2c->dev);
@@ -5702,7 +5689,7 @@ static struct i2c_driver rt5677_i2c_driver = {
.driver = {
.name = RT5677_DRV_NAME,
.of_match_table = rt5677_of_match,
- .acpi_match_table = ACPI_PTR(rt5677_acpi_match),
+ .acpi_match_table = rt5677_acpi_match,
},
.probe = rt5677_i2c_probe,
.remove = rt5677_i2c_remove,
@@ -1753,8 +1753,8 @@ enum {
};
enum rt5677_type {
- RT5677,
- RT5676,
+ RT5677 = 1,
+ RT5676 = 2,
};
/* ASRC clock source selection */