leds: pca955x: Cleanup OF/ID table terminators

Some cleanups:
 * Remove the trailing comma in the terminator entry for the OF
   table making code robust against (theoretical) misrebases or other
   similar things where the new entry goes _after_ the termination without
   the compiler noticing.
 * Drop a space from terminator entry for ID table.

While at it, move OF/ID table near to the user.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230923171921.53503-3-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 891cfc05301d3b968b07981cc7a777a5be3d7ed2..94a9f8a54b35933d68cab6b64f1b9d7126c46740 100644 (file)
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -104,16 +104,6 @@ static const struct pca955x_chipdef pca955x_chipdefs[] = {
        },
 };
 
-static const struct i2c_device_id pca955x_id[] = {
-       { "pca9550", (kernel_ulong_t)&pca955x_chipdefs[pca9550] },
-       { "pca9551", (kernel_ulong_t)&pca955x_chipdefs[pca9551] },
-       { "pca9552", (kernel_ulong_t)&pca955x_chipdefs[pca9552] },
-       { "ibm-pca9552", (kernel_ulong_t)&pca955x_chipdefs[ibm_pca9552] },
-       { "pca9553", (kernel_ulong_t)&pca955x_chipdefs[pca9553] },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, pca955x_id);
-
 struct pca955x {
        struct mutex lock;
        struct pca955x_led *leds;
@@ -457,16 +447,6 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
        return pdata;
 }
 
-static const struct of_device_id of_pca955x_match[] = {
-       { .compatible = "nxp,pca9550", .data = &pca955x_chipdefs[pca9550] },
-       { .compatible = "nxp,pca9551", .data = &pca955x_chipdefs[pca9551] },
-       { .compatible = "nxp,pca9552", .data = &pca955x_chipdefs[pca9552] },
-       { .compatible = "ibm,pca9552", .data = &pca955x_chipdefs[ibm_pca9552] },
-       { .compatible = "nxp,pca9553", .data = &pca955x_chipdefs[pca9553] },
-       {},
-};
-MODULE_DEVICE_TABLE(of, of_pca955x_match);
-
 static int pca955x_probe(struct i2c_client *client)
 {
        struct pca955x *pca955x;
@@ -650,6 +630,26 @@ static int pca955x_probe(struct i2c_client *client)
        return 0;
 }
 
+static const struct i2c_device_id pca955x_id[] = {
+       { "pca9550", (kernel_ulong_t)&pca955x_chipdefs[pca9550] },
+       { "pca9551", (kernel_ulong_t)&pca955x_chipdefs[pca9551] },
+       { "pca9552", (kernel_ulong_t)&pca955x_chipdefs[pca9552] },
+       { "ibm-pca9552", (kernel_ulong_t)&pca955x_chipdefs[ibm_pca9552] },
+       { "pca9553", (kernel_ulong_t)&pca955x_chipdefs[pca9553] },
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, pca955x_id);
+
+static const struct of_device_id of_pca955x_match[] = {
+       { .compatible = "nxp,pca9550", .data = &pca955x_chipdefs[pca9550] },
+       { .compatible = "nxp,pca9551", .data = &pca955x_chipdefs[pca9551] },
+       { .compatible = "nxp,pca9552", .data = &pca955x_chipdefs[pca9552] },
+       { .compatible = "ibm,pca9552", .data = &pca955x_chipdefs[ibm_pca9552] },
+       { .compatible = "nxp,pca9553", .data = &pca955x_chipdefs[pca9553] },
+       {}
+};
+MODULE_DEVICE_TABLE(of, of_pca955x_match);
+
 static struct i2c_driver pca955x_driver = {
        .driver = {
                .name   = "leds-pca955x",