ASoC: ssm2518: drop support for platform data
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Sep 2022 02:58:03 +0000 (19:58 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 23 Sep 2022 16:54:17 +0000 (17:54 +0100)
There are currently no users of this driver's platform data in the
mainline kernel, so let's drop it.

Newer devices should use DT, ACPI, or static software properties to
describe the hardware.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/20220920025804.1788667-1-dmitry.torokhov@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/linux/platform_data/ssm2518.h [deleted file]
sound/soc/codecs/ssm2518.c

diff --git a/include/linux/platform_data/ssm2518.h b/include/linux/platform_data/ssm2518.h
deleted file mode 100644 (file)
index 3f9e632..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * SSM2518 amplifier audio driver
- *
- * Copyright 2013 Analog Devices Inc.
- *  Author: Lars-Peter Clausen <lars@metafoo.de>
- */
-
-#ifndef __LINUX_PLATFORM_DATA_SSM2518_H__
-#define __LINUX_PLATFORM_DATA_SSM2518_H__
-
-/**
- * struct ssm2518_platform_data - Platform data for the ssm2518 driver
- * @enable_gpio: GPIO connected to the nSD pin. Set to -1 if the nSD pin is
- *            hardwired.
- */
-struct ssm2518_platform_data {
-       int enable_gpio;
-};
-
-#endif
index 6d88478..feee282 100644 (file)
@@ -13,7 +13,6 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include <linux/platform_data/ssm2518.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -736,7 +735,6 @@ static const struct regmap_config ssm2518_regmap_config = {
 
 static int ssm2518_i2c_probe(struct i2c_client *i2c)
 {
-       struct ssm2518_platform_data *pdata = i2c->dev.platform_data;
        struct ssm2518 *ssm2518;
        int ret;
 
@@ -744,9 +742,7 @@ static int ssm2518_i2c_probe(struct i2c_client *i2c)
        if (ssm2518 == NULL)
                return -ENOMEM;
 
-       if (pdata) {
-               ssm2518->enable_gpio = pdata->enable_gpio;
-       } else if (i2c->dev.of_node) {
+       if (i2c->dev.of_node) {
                ssm2518->enable_gpio = of_get_gpio(i2c->dev.of_node, 0);
                if (ssm2518->enable_gpio < 0 && ssm2518->enable_gpio != -ENOENT)
                        return ssm2518->enable_gpio;