misc: eeprom_93xx46: Hide legacy platform data in the driver

First of all, there is no user for the platform data in the kernel.
Second, it needs a lot of updates to follow the modern standards
of the kernel, including proper Device Tree bindings and device
property handling.

For now, just hide the legacy platform data in the driver's code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240508184905.2102633-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index bbcc9412bb4e692e57dc3df715368da9a998eff6..a5a043ddedbb6f73cfb65116ff00a87df0eb0e8f 100644 (file)
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -5,6 +5,7 @@
  * (C) 2011 DENX Software Engineering, Anatolij Gustschin <agust@denx.de>
  */
 
+#include <linux/bits.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
@@ -19,7 +20,31 @@
 
 #include <linux/nvmem-provider.h>
 
-#include <linux/eeprom_93xx46.h>
+struct eeprom_93xx46_platform_data {
+       unsigned char   flags;
+#define EE_ADDR8       0x01            /*  8 bit addr. cfg */
+#define EE_ADDR16      0x02            /* 16 bit addr. cfg */
+#define EE_READONLY    0x08            /* forbid writing */
+#define EE_SIZE1K      0x10            /* 1 kb of data, that is a 93xx46 */
+#define EE_SIZE2K      0x20            /* 2 kb of data, that is a 93xx56 */
+#define EE_SIZE4K      0x40            /* 4 kb of data, that is a 93xx66 */
+
+       unsigned int    quirks;
+/* Single word read transfers only; no sequential read. */
+#define EEPROM_93XX46_QUIRK_SINGLE_WORD_READ           (1 << 0)
+/* Instructions such as EWEN are (addrlen + 2) in length. */
+#define EEPROM_93XX46_QUIRK_INSTRUCTION_LENGTH         (1 << 1)
+/* Add extra cycle after address during a read */
+#define EEPROM_93XX46_QUIRK_EXTRA_READ_CYCLE           BIT(2)
+
+       /*
+        * optional hooks to control additional logic
+        * before and after spi transfer.
+        */
+       void (*prepare)(void *);
+       void (*finish)(void *);
+       struct gpio_desc *select;
+};
 
 #define OP_START       0x4
 #define OP_WRITE       (OP_START | 0x1)
@@ -479,11 +504,9 @@ static int eeprom_93xx46_probe(struct spi_device *spi)
        struct device *dev = &spi->dev;
        int err;
 
-       if (dev_fwnode(dev)) {
-               err = eeprom_93xx46_probe_fw(dev);
-               if (err < 0)
-                       return err;
-       }
+       err = eeprom_93xx46_probe_fw(dev);
+       if (err < 0)
+               return err;
 
        pd = spi->dev.platform_data;
        if (!pd) {

diff --git a/include/linux/eeprom_93xx46.h b/include/linux/eeprom_93xx46.h
deleted file mode 100644 (file)
index 34c2175..0000000
--- a/include/linux/eeprom_93xx46.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Module: eeprom_93xx46
- * platform description for 93xx46 EEPROMs.
- */
-#include <linux/gpio/consumer.h>
-
-struct eeprom_93xx46_platform_data {
-       unsigned char   flags;
-#define EE_ADDR8       0x01            /*  8 bit addr. cfg */
-#define EE_ADDR16      0x02            /* 16 bit addr. cfg */
-#define EE_READONLY    0x08            /* forbid writing */
-#define EE_SIZE1K      0x10            /* 1 kb of data, that is a 93xx46 */
-#define EE_SIZE2K      0x20            /* 2 kb of data, that is a 93xx56 */
-#define EE_SIZE4K      0x40            /* 4 kb of data, that is a 93xx66 */
-
-       unsigned int    quirks;
-/* Single word read transfers only; no sequential read. */
-#define EEPROM_93XX46_QUIRK_SINGLE_WORD_READ           (1 << 0)
-/* Instructions such as EWEN are (addrlen + 2) in length. */
-#define EEPROM_93XX46_QUIRK_INSTRUCTION_LENGTH         (1 << 1)
-/* Add extra cycle after address during a read */
-#define EEPROM_93XX46_QUIRK_EXTRA_READ_CYCLE           BIT(2)
-
-       /*
-        * optional hooks to control additional logic
-        * before and after spi transfer.
-        */
-       void (*prepare)(void *);
-       void (*finish)(void *);
-       struct gpio_desc *select;
-};