]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/blobdiff - drivers/iio/adc/meson_saradc.c
iio: adc: meson-saradc: Make the of_device_id array style consistent
[mirror_ubuntu-hirsute-kernel.git] / drivers / iio / adc / meson_saradc.c
index 93c2252c0b89017f9d39bbd9f4faf6fbb526baf0..743c5a47eed86d78c51511bf46e0ca08313d9960 100644 (file)
@@ -719,11 +719,8 @@ static int meson_sar_adc_temp_sensor_init(struct iio_dev *indio_dev)
                if (ret == -ENODEV)
                        return 0;
 
-               if (ret != -EPROBE_DEFER)
-                       dev_err(indio_dev->dev.parent,
-                               "failed to get temperature_calib cell\n");
-
-               return ret;
+               return dev_err_probe(indio_dev->dev.parent, ret,
+                                    "failed to get temperature_calib cell\n");
        }
 
        priv->tsc_regmap =
@@ -1153,16 +1150,13 @@ static const struct of_device_id meson_sar_adc_of_match[] = {
        {
                .compatible = "amlogic,meson8-saradc",
                .data = &meson_sar_adc_meson8_data,
-       },
-       {
+       }, {
                .compatible = "amlogic,meson8b-saradc",
                .data = &meson_sar_adc_meson8b_data,
-       },
-       {
+       }, {
                .compatible = "amlogic,meson8m2-saradc",
                .data = &meson_sar_adc_meson8m2_data,
-       },
-       {
+       }, {
                .compatible = "amlogic,meson-gxbb-saradc",
                .data = &meson_sar_adc_gxbb_data,
        }, {
@@ -1178,7 +1172,7 @@ static const struct of_device_id meson_sar_adc_of_match[] = {
                .compatible = "amlogic,meson-g12a-saradc",
                .data = &meson_sar_adc_g12a_data,
        },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match);