usb: misc: usb251xb: drop of_match_ptr for ID table
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sat, 11 Mar 2023 17:36:24 +0000 (18:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Mar 2023 11:15:23 +0000 (12:15 +0100)
The driver will match mostly by DT table (even thought there is regular
ID table) so there is little benefit in of_match_ptr (this also allows
ACPI matching via PRP0001, even though it might not be relevant here).

  drivers/usb/misc/usb251xb.c:223:35: error: ‘usb2517i_data’ defined but not used [-Werror=unused-const-variable=]
  drivers/usb/misc/usb251xb.c:215:35: error: ‘usb2517_data’ defined but not used [-Werror=unused-const-variable=]
  drivers/usb/misc/usb251xb.c:207:35: error: ‘usb2514bi_data’ defined but not used [-Werror=unused-const-variable=]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Richard Leitner <richard.leitner@skidata.com>
Link: https://lore.kernel.org/r/20230311173624.263189-7-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/usb251xb.c

index 96f25c1..ce1da80 100644 (file)
@@ -377,7 +377,6 @@ out_err:
        return err;
 }
 
-#ifdef CONFIG_OF
 static void usb251xb_get_ports_field(struct usb251xb *hub,
                                    const char *prop_name, u8 port_cnt,
                                    bool ds_only, u8 *fld)
@@ -623,13 +622,6 @@ static const struct of_device_id usb251xb_of_match[] = {
        }
 };
 MODULE_DEVICE_TABLE(of, usb251xb_of_match);
-#else /* CONFIG_OF */
-static int usb251xb_get_ofdata(struct usb251xb *hub,
-                              const struct usb251xb_data *data)
-{
-       return 0;
-}
-#endif /* CONFIG_OF */
 
 static void usb251xb_regulator_disable_action(void *data)
 {
@@ -751,7 +743,7 @@ MODULE_DEVICE_TABLE(i2c, usb251xb_id);
 static struct i2c_driver usb251xb_i2c_driver = {
        .driver = {
                .name = DRIVER_NAME,
-               .of_match_table = of_match_ptr(usb251xb_of_match),
+               .of_match_table = usb251xb_of_match,
                .pm = &usb251xb_pm_ops,
        },
        .probe_new = usb251xb_i2c_probe,