Skip to contentSkip to conversation

iio: adc: xilinx-ams: Convert to use fwnode_device_is_compatible()

PATCH In review Andy Shevchenko 2 participants 2 messages Jan 19, 2023 – Jan 20, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: adc: xilinx-ams: Convert to use fwnode_device_is_compatible()

Replace open coded fwnode_device_is_compatible() in the driver.

---
 drivers/iio/adc/xilinx-ams.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/iio/adc/xilinx-ams.c +3 -6
index a507d2e17079..34cf336b3490 100644
@@ -1220,8 +1220,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
 	int num_channels = 0;
 	int ret;
 
-	if (fwnode_property_match_string(fwnode, "compatible",
-					 "xlnx,zynqmp-ams-ps") == 0) {
+	if (fwnode_device_is_compatible(fwnode, "xlnx,zynqmp-ams-ps")) {
 		ams->ps_base = fwnode_iomap(fwnode, 0);
 		if (!ams->ps_base)
 			return -ENXIO;
@@ -1232,8 +1231,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
 		/* add PS channels to iio device channels */
 		memcpy(channels, ams_ps_channels, sizeof(ams_ps_channels));
 		num_channels = ARRAY_SIZE(ams_ps_channels);
-	} else if (fwnode_property_match_string(fwnode, "compatible",
-						"xlnx,zynqmp-ams-pl") == 0) {
+	} else if (fwnode_device_is_compatible(fwnode, "xlnx,zynqmp-ams-pl")) {
 		ams->pl_base = fwnode_iomap(fwnode, 0);
 		if (!ams->pl_base)
 			return -ENXIO;
@@ -1247,8 +1245,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
 		num_channels += AMS_PL_MAX_FIXED_CHANNEL;
 		num_channels = ams_get_ext_chan(fwnode, channels,
 						num_channels);
-	} else if (fwnode_property_match_string(fwnode, "compatible",
-						"xlnx,zynqmp-ams") == 0) {
+	} else if (fwnode_device_is_compatible(fwnode, "xlnx,zynqmp-ams")) {
 		/* add AMS channels to iio device channels */
 		memcpy(channels, ams_ctrl_channels, sizeof(ams_ctrl_channels));
 		num_channels += ARRAY_SIZE(ams_ctrl_channels);
Signature · 7 lines
2.39.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 43 lines · Andy Shevchenko

Replace open coded fwnode_device_is_compatible() in the driver.

---
  drivers/iio/adc/xilinx-ams.c | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
drivers/iio/adc/xilinx-ams.c +3 -7
index a507d2e17079..34cf336b3490 100644
@@ -1220,8 +1220,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
         int num_channels = 0;
         int ret;
 
-       if (fwnode_property_match_string(fwnode, "compatible",
-                                        "xlnx,zynqmp-ams-ps") == 0) {
+       if (fwnode_device_is_compatible(fwnode, "xlnx,zynqmp-ams-ps")) {
                 ams->ps_base = fwnode_iomap(fwnode, 0);
                 if (!ams->ps_base)
                         return -ENXIO;
@@ -1232,8 +1231,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
                 /* add PS channels to iio device channels */
                 memcpy(channels, ams_ps_channels, sizeof(ams_ps_channels));
                 num_channels = ARRAY_SIZE(ams_ps_channels);
-       } else if (fwnode_property_match_string(fwnode, "compatible",
-                                               "xlnx,zynqmp-ams-pl") == 0) {
+       } else if (fwnode_device_is_compatible(fwnode, "xlnx,zynqmp-ams-pl")) {
                 ams->pl_base = fwnode_iomap(fwnode, 0);
                 if (!ams->pl_base)
                         return -ENXIO;
@@ -1247,8 +1245,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
                 num_channels += AMS_PL_MAX_FIXED_CHANNEL;
                 num_channels = ams_get_ext_chan(fwnode, channels,
                                                 num_channels);
-       } else if (fwnode_property_match_string(fwnode, "compatible",
-                                               "xlnx,zynqmp-ams") == 0) {
+       } else if (fwnode_device_is_compatible(fwnode, "xlnx,zynqmp-ams")) {
                 /* add AMS channels to iio device channels */
                 memcpy(channels, ams_ctrl_channels, sizeof(ams_ctrl_channels));
                 num_channels += ARRAY_SIZE(ams_ctrl_channels);
--
Quoted 2 lines

2.39.0

Thanks,
Michal