spi: Remove support for dangling device properties

>From now on only accepting complete software nodes.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20210303152814.35070-5-heikki.krogerus@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 9b46998ae2a44f8c9f5d3d95c1d5dbd9e92195c6..016bbfbce90b7bfafe4b8b5f8ebecc5e5a4c312b 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -676,34 +676,23 @@ struct spi_device *spi_new_device(struct spi_controller *ctlr,
        proxy->controller_data = chip->controller_data;
        proxy->controller_state = NULL;
 
-       if (chip->properties) {
-               status = device_add_properties(&proxy->dev, chip->properties);
-               if (status) {
-                       dev_err(&ctlr->dev,
-                               "failed to add properties to '%s': %d\n",
-                               chip->modalias, status);
-                       goto err_dev_put;
-               }
-       }
-
        if (chip->swnode) {
                status = device_add_software_node(&proxy->dev, chip->swnode);
                if (status) {
                        dev_err(&ctlr->dev, "failed to add softwade node to '%s': %d\n",
                                chip->modalias, status);
-                       goto err_remove_props;
+                       goto err_dev_put;
                }
        }
 
        status = spi_add_device(proxy);
        if (status < 0)
-               goto err_remove_props;
+               goto err_dev_put;
 
        return proxy;
 
-err_remove_props:
-       device_remove_software_node(&proxy->dev);
 err_dev_put:
+       device_remove_software_node(&proxy->dev);
        spi_dev_put(proxy);
        return NULL;
 }
@@ -764,7 +753,6 @@ static void spi_match_controller_to_boardinfo(struct spi_controller *ctlr,
  *
  * The board info passed can safely be __initdata ... but be careful of
  * any embedded pointers (platform_data, etc), they're copied as-is.
- * Device properties are deep-copied though.
  *
  * Return: zero on success, else a negative error code.
  */
@@ -784,12 +772,6 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n)
                struct spi_controller *ctlr;
 
                memcpy(&bi->board_info, info, sizeof(*info));
-               if (info->properties) {
-                       bi->board_info.properties =
-                                       property_entries_dup(info->properties);
-                       if (IS_ERR(bi->board_info.properties))
-                               return PTR_ERR(bi->board_info.properties);
-               }
 
                mutex_lock(&board_lock);
                list_add_tail(&bi->list, &board_list);

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index f47f94ea6fa99a056183f02e0074b4520ff77bcd..7cb3194d5ba59a58a0b521091804662aa2686719 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -19,7 +19,6 @@
 #include <uapi/linux/spi/spi.h>
 
 struct dma_chan;
-struct property_entry;
 struct software_node;
 struct spi_controller;
 struct spi_transfer;
@@ -1410,7 +1409,6 @@ static inline ssize_t spi_w8r16be(struct spi_device *spi, u8 cmd)
  * @modalias: Initializes spi_device.modalias; identifies the driver.
  * @platform_data: Initializes spi_device.platform_data; the particular
  *     data stored there is driver-specific.
- * @properties: Deprecated - use software node instead.
  * @swnode: Software node for the device.
  * @controller_data: Initializes spi_device.controller_data; some
  *     controllers need hints about hardware setup, e.g. for DMA.
@@ -1444,12 +1442,10 @@ struct spi_board_info {
         *
         * platform_data goes to spi_device.dev.platform_data,
         * controller_data goes to spi_device.controller_data,
-        * device properties are copied and attached to spi_device,
         * irq is copied too
         */
        char            modalias[SPI_NAME_SIZE];
        const void      *platform_data;
-       const struct property_entry *properties;
        const struct software_node *swnode;
        void            *controller_data;
        int             irq;