hwmon: (sht3x) remove sht3x_platform_data

Since no in-tree driver supports it, sht3x_platform_data has been
removed and the relevant properties have been moved to sht3x_data.

Signed-off-by: JuenKit Yip <JuenKit_Yip@hotmail.com>
Link: https://lore.kernel.org/r/DB4PR10MB626126FB7226D5AF341197449258A@DB4PR10MB6261.EURPRD10.PROD.OUTLOOK.COM
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/Documentation/hwmon/sht3x.rst b/Documentation/hwmon/sht3x.rst
index 95a850d..31fd36b 100644 (file)
--- a/Documentation/hwmon/sht3x.rst
+++ b/Documentation/hwmon/sht3x.rst
@@ -28,7 +28,7 @@ The device communicates with the I2C protocol. Sensors can have the I2C
 addresses 0x44 or 0x45, depending on the wiring. See
 Documentation/i2c/instantiating-devices.rst for methods to instantiate the device.
 
-There are two options configurable by means of sht3x_platform_data:
+There are two options configurable by means of sht3x_data:
 
 1. blocking (pull the I2C clock line down while performing the measurement) or
    non-blocking mode. Blocking mode will guarantee the fastest result but

diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c
index 1dab300..12a6f5c 100644 (file)
--- a/drivers/hwmon/sht3x.c
+++ b/drivers/hwmon/sht3x.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
-#include <linux/platform_data/sht3x.h>
 
 /* commands (high precision mode) */
 static const unsigned char sht3x_cmd_measure_blocking_hpm[]    = { 0x2c, 0x06 };
@@ -135,8 +134,8 @@ struct sht3x_data {
        const unsigned char *command;
        u32 wait_time;                  /* in us*/
        unsigned long last_update;      /* last update in periodic mode*/
-
-       struct sht3x_platform_data setup;
+       bool blocking_io;
+       bool high_precision;
 
        /*
         * cached values for temperature and humidity and limits
@@ -441,13 +440,13 @@ static void sht3x_select_command(struct sht3x_data *data)
        if (data->mode > 0) {
                data->command = sht3x_cmd_measure_periodic_mode;
                data->wait_time = 0;
-       } else if (data->setup.blocking_io) {
-               data->command = data->setup.high_precision ?
+       } else if (data->blocking_io) {
+               data->command = data->high_precision ?
                                sht3x_cmd_measure_blocking_hpm :
                                sht3x_cmd_measure_blocking_lpm;
                data->wait_time = 0;
        } else {
-               if (data->setup.high_precision) {
+               if (data->high_precision) {
                        data->command = sht3x_cmd_measure_nonblocking_hpm;
                        data->wait_time = SHT3X_NONBLOCKING_WAIT_TIME_HPM;
                } else {
@@ -595,7 +594,7 @@ static ssize_t update_interval_store(struct device *dev,
        }
 
        if (mode > 0) {
-               if (data->setup.high_precision)
+               if (data->high_precision)
                        command = periodic_measure_commands_hpm[mode - 1];
                else
                        command = periodic_measure_commands_lpm[mode - 1];
@@ -690,16 +689,13 @@ static int sht3x_probe(struct i2c_client *client)
        if (!data)
                return -ENOMEM;
 
-       data->setup.blocking_io = false;
-       data->setup.high_precision = true;
+       data->blocking_io = false;
+       data->high_precision = true;
        data->mode = 0;
        data->last_update = jiffies - msecs_to_jiffies(3000);
        data->client = client;
        crc8_populate_msb(sht3x_crc8_table, SHT3X_CRC8_POLYNOMIAL);
 
-       if (client->dev.platform_data)
-               data->setup = *(struct sht3x_platform_data *)dev->platform_data;
-
        sht3x_select_command(data);
 
        mutex_init(&data->i2c_lock);

diff --git a/include/linux/platform_data/sht3x.h b/include/linux/platform_data/sht3x.h
deleted file mode 100644 (file)
index 14680d2..0000000
--- a/include/linux/platform_data/sht3x.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2016 Sensirion AG, Switzerland
- * Author: David Frey <david.frey@sensirion.com>
- * Author: Pascal Sachs <pascal.sachs@sensirion.com>
- */
-
-#ifndef __SHT3X_H_
-#define __SHT3X_H_
-
-struct sht3x_platform_data {
-       bool blocking_io;
-       bool high_precision;
-};
-#endif /* __SHT3X_H_ */