* [PATCH] v4l2-core: fix coding style for the two new c files
@ 2019-08-26 14:03 Mauro Carvalho Chehab
2019-08-26 14:14 ` Sakari Ailus
0 siblings, 1 reply; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2019-08-26 14:03 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Ezequiel Garcia,
Hans Verkuil
As I2C and SPI parts of the V4L2 core got split, let's take
the chance and solve the CodingStyle issues there, as reported
by checkpatch --strict.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
drivers/media/v4l2-core/v4l2-i2c.c | 66 +++++++++++++++++++-----------
drivers/media/v4l2-core/v4l2-spi.c | 21 ++++++----
2 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-i2c.c b/drivers/media/v4l2-core/v4l2-i2c.c
index d549291ab22b..5bf99e7c0c09 100644
--- a/drivers/media/v4l2-core/v4l2-i2c.c
+++ b/drivers/media/v4l2-core/v4l2-i2c.c
@@ -28,7 +28,8 @@ void v4l2_i2c_subdev_unregister(struct v4l2_subdev *sd)
i2c_unregister_device(client);
}
-void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd, struct i2c_client *client,
+void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd,
+ struct i2c_client *client,
const char *devname, const char *postfix)
{
if (!devname)
@@ -42,7 +43,7 @@ void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd, struct i2c_client *client,
EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_set_name);
void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
- const struct v4l2_subdev_ops *ops)
+ const struct v4l2_subdev_ops *ops)
{
v4l2_subdev_init(sd, ops);
sd->flags |= V4L2_SUBDEV_FL_IS_I2C;
@@ -57,9 +58,11 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
/* Load an i2c sub-device. */
-struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
- struct i2c_adapter *adapter, struct i2c_board_info *info,
- const unsigned short *probe_addrs)
+struct v4l2_subdev
+*v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
+ struct i2c_adapter *adapter,
+ struct i2c_board_info *info,
+ const unsigned short *probe_addrs)
{
struct v4l2_subdev *sd = NULL;
struct i2c_client *client;
@@ -76,14 +79,16 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
else
client = i2c_new_device(adapter, info);
- /* Note: by loading the module first we are certain that c->driver
- will be set if the driver was found. If the module was not loaded
- first, then the i2c core tries to delay-load the module for us,
- and then c->driver is still NULL until the module is finally
- loaded. This delay-load mechanism doesn't work if other drivers
- want to use the i2c device, so explicitly loading the module
- is the best alternative. */
- if (client == NULL || client->dev.driver == NULL)
+ /*
+ * Note: by loading the module first we are certain that c->driver
+ * will be set if the driver was found. If the module was not loaded
+ * first, then the i2c core tries to delay-load the module for us,
+ * and then c->driver is still NULL until the module is finally
+ * loaded. This delay-load mechanism doesn't work if other drivers
+ * want to use the i2c device, so explicitly loading the module
+ * is the best alternative.
+ */
+ if (!client || !client->dev.driver)
goto error;
/* Lock the module so we can safely get the v4l2_subdev pointer */
@@ -91,35 +96,44 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
goto error;
sd = i2c_get_clientdata(client);
- /* Register with the v4l2_device which increases the module's
- use count as well. */
+ /*
+ * Register with the v4l2_device which increases the module's
+ * use count as well.
+ */
if (v4l2_device_register_subdev(v4l2_dev, sd))
sd = NULL;
/* Decrease the module use count to match the first try_module_get. */
module_put(client->dev.driver->owner);
error:
- /* If we have a client but no subdev, then something went wrong and
- we must unregister the client. */
- if (client && sd == NULL)
+ /*
+ * If we have a client but no subdev, then something went wrong and
+ * we must unregister the client.
+ */
+ if (client && !sd)
i2c_unregister_device(client);
return sd;
}
EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_board);
struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
- struct i2c_adapter *adapter, const char *client_type,
- u8 addr, const unsigned short *probe_addrs)
+ struct i2c_adapter *adapter,
+ const char *client_type,
+ u8 addr,
+ const unsigned short *probe_addrs)
{
struct i2c_board_info info;
- /* Setup the i2c board info with the device type and
- the device address. */
+ /*
+ * Setup the i2c board info with the device type and
+ * the device address.
+ */
memset(&info, 0, sizeof(info));
strscpy(info.type, client_type, sizeof(info.type));
info.addr = addr;
- return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info, probe_addrs);
+ return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info,
+ probe_addrs);
}
EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
@@ -132,8 +146,10 @@ unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd)
}
EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_addr);
-/* Return a list of I2C tuner addresses to probe. Use only if the tuner
- addresses are unknown. */
+/*
+ * Return a list of I2C tuner addresses to probe. Use only if the tuner
+ * addresses are unknown.
+ */
const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type)
{
static const unsigned short radio_addrs[] = {
diff --git a/drivers/media/v4l2-core/v4l2-spi.c b/drivers/media/v4l2-core/v4l2-spi.c
index 15162659a63b..eadecdff7349 100644
--- a/drivers/media/v4l2-core/v4l2-spi.c
+++ b/drivers/media/v4l2-core/v4l2-spi.c
@@ -17,7 +17,7 @@ void v4l2_spi_subdev_unregister(struct v4l2_subdev *sd)
}
void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
- const struct v4l2_subdev_ops *ops)
+ const struct v4l2_subdev_ops *ops)
{
v4l2_subdev_init(sd, ops);
sd->flags |= V4L2_SUBDEV_FL_IS_SPI;
@@ -29,12 +29,13 @@ void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
spi_set_drvdata(spi, sd);
/* initialize name */
snprintf(sd->name, sizeof(sd->name), "%s %s",
- spi->dev.driver->name, dev_name(&spi->dev));
+ spi->dev.driver->name, dev_name(&spi->dev));
}
EXPORT_SYMBOL_GPL(v4l2_spi_subdev_init);
struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
- struct spi_master *master, struct spi_board_info *info)
+ struct spi_master *master,
+ struct spi_board_info *info)
{
struct v4l2_subdev *sd = NULL;
struct spi_device *spi = NULL;
@@ -46,7 +47,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
spi = spi_new_device(master, info);
- if (spi == NULL || spi->dev.driver == NULL)
+ if (!spi || !spi->dev.driver)
goto error;
if (!try_module_get(spi->dev.driver->owner))
@@ -54,8 +55,10 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
sd = spi_get_drvdata(spi);
- /* Register with the v4l2_device which increases the module's
- use count as well. */
+ /*
+ * Register with the v4l2_device which increases the module's
+ * use count as well.
+ */
if (v4l2_device_register_subdev(v4l2_dev, sd))
sd = NULL;
@@ -63,8 +66,10 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
module_put(spi->dev.driver->owner);
error:
- /* If we have a client but no subdev, then something went wrong and
- we must unregister the client. */
+ /*
+ * If we have a client but no subdev, then something went wrong and
+ * we must unregister the client.
+ */
if (!sd)
spi_unregister_device(spi);
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] v4l2-core: fix coding style for the two new c files
2019-08-26 14:03 [PATCH] v4l2-core: fix coding style for the two new c files Mauro Carvalho Chehab
@ 2019-08-26 14:14 ` Sakari Ailus
0 siblings, 0 replies; 2+ messages in thread
From: Sakari Ailus @ 2019-08-26 14:14 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Ezequiel Garcia,
Hans Verkuil
Hi Mauro,
Thanks for the patch.
On Mon, Aug 26, 2019 at 11:03:18AM -0300, Mauro Carvalho Chehab wrote:
> As I2C and SPI parts of the V4L2 core got split, let's take
> the chance and solve the CodingStyle issues there, as reported
> by checkpatch --strict.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
> ---
> drivers/media/v4l2-core/v4l2-i2c.c | 66 +++++++++++++++++++-----------
> drivers/media/v4l2-core/v4l2-spi.c | 21 ++++++----
> 2 files changed, 54 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-i2c.c b/drivers/media/v4l2-core/v4l2-i2c.c
> index d549291ab22b..5bf99e7c0c09 100644
> --- a/drivers/media/v4l2-core/v4l2-i2c.c
> +++ b/drivers/media/v4l2-core/v4l2-i2c.c
> @@ -28,7 +28,8 @@ void v4l2_i2c_subdev_unregister(struct v4l2_subdev *sd)
> i2c_unregister_device(client);
> }
>
> -void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd, struct i2c_client *client,
> +void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd,
> + struct i2c_client *client,
> const char *devname, const char *postfix)
> {
> if (!devname)
> @@ -42,7 +43,7 @@ void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd, struct i2c_client *client,
> EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_set_name);
>
> void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
> - const struct v4l2_subdev_ops *ops)
> + const struct v4l2_subdev_ops *ops)
> {
> v4l2_subdev_init(sd, ops);
> sd->flags |= V4L2_SUBDEV_FL_IS_I2C;
> @@ -57,9 +58,11 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
> EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
>
> /* Load an i2c sub-device. */
> -struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
> - struct i2c_adapter *adapter, struct i2c_board_info *info,
> - const unsigned short *probe_addrs)
> +struct v4l2_subdev
> +*v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
Hmm. I'd put the asterisk on the previous line --- it's part of the type
after all.
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> + struct i2c_adapter *adapter,
> + struct i2c_board_info *info,
> + const unsigned short *probe_addrs)
> {
> struct v4l2_subdev *sd = NULL;
> struct i2c_client *client;
> @@ -76,14 +79,16 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
> else
> client = i2c_new_device(adapter, info);
>
> - /* Note: by loading the module first we are certain that c->driver
> - will be set if the driver was found. If the module was not loaded
> - first, then the i2c core tries to delay-load the module for us,
> - and then c->driver is still NULL until the module is finally
> - loaded. This delay-load mechanism doesn't work if other drivers
> - want to use the i2c device, so explicitly loading the module
> - is the best alternative. */
> - if (client == NULL || client->dev.driver == NULL)
> + /*
> + * Note: by loading the module first we are certain that c->driver
> + * will be set if the driver was found. If the module was not loaded
> + * first, then the i2c core tries to delay-load the module for us,
> + * and then c->driver is still NULL until the module is finally
> + * loaded. This delay-load mechanism doesn't work if other drivers
> + * want to use the i2c device, so explicitly loading the module
> + * is the best alternative.
> + */
> + if (!client || !client->dev.driver)
> goto error;
>
> /* Lock the module so we can safely get the v4l2_subdev pointer */
> @@ -91,35 +96,44 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
> goto error;
> sd = i2c_get_clientdata(client);
>
> - /* Register with the v4l2_device which increases the module's
> - use count as well. */
> + /*
> + * Register with the v4l2_device which increases the module's
> + * use count as well.
> + */
> if (v4l2_device_register_subdev(v4l2_dev, sd))
> sd = NULL;
> /* Decrease the module use count to match the first try_module_get. */
> module_put(client->dev.driver->owner);
>
> error:
> - /* If we have a client but no subdev, then something went wrong and
> - we must unregister the client. */
> - if (client && sd == NULL)
> + /*
> + * If we have a client but no subdev, then something went wrong and
> + * we must unregister the client.
> + */
> + if (client && !sd)
> i2c_unregister_device(client);
> return sd;
> }
> EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_board);
>
> struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
> - struct i2c_adapter *adapter, const char *client_type,
> - u8 addr, const unsigned short *probe_addrs)
> + struct i2c_adapter *adapter,
> + const char *client_type,
> + u8 addr,
> + const unsigned short *probe_addrs)
> {
> struct i2c_board_info info;
>
> - /* Setup the i2c board info with the device type and
> - the device address. */
> + /*
> + * Setup the i2c board info with the device type and
> + * the device address.
> + */
> memset(&info, 0, sizeof(info));
> strscpy(info.type, client_type, sizeof(info.type));
> info.addr = addr;
>
> - return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info, probe_addrs);
> + return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info,
> + probe_addrs);
> }
> EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
>
> @@ -132,8 +146,10 @@ unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd)
> }
> EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_addr);
>
> -/* Return a list of I2C tuner addresses to probe. Use only if the tuner
> - addresses are unknown. */
> +/*
> + * Return a list of I2C tuner addresses to probe. Use only if the tuner
> + * addresses are unknown.
> + */
> const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type)
> {
> static const unsigned short radio_addrs[] = {
> diff --git a/drivers/media/v4l2-core/v4l2-spi.c b/drivers/media/v4l2-core/v4l2-spi.c
> index 15162659a63b..eadecdff7349 100644
> --- a/drivers/media/v4l2-core/v4l2-spi.c
> +++ b/drivers/media/v4l2-core/v4l2-spi.c
> @@ -17,7 +17,7 @@ void v4l2_spi_subdev_unregister(struct v4l2_subdev *sd)
> }
>
> void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
> - const struct v4l2_subdev_ops *ops)
> + const struct v4l2_subdev_ops *ops)
> {
> v4l2_subdev_init(sd, ops);
> sd->flags |= V4L2_SUBDEV_FL_IS_SPI;
> @@ -29,12 +29,13 @@ void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
> spi_set_drvdata(spi, sd);
> /* initialize name */
> snprintf(sd->name, sizeof(sd->name), "%s %s",
> - spi->dev.driver->name, dev_name(&spi->dev));
> + spi->dev.driver->name, dev_name(&spi->dev));
> }
> EXPORT_SYMBOL_GPL(v4l2_spi_subdev_init);
>
> struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
> - struct spi_master *master, struct spi_board_info *info)
> + struct spi_master *master,
> + struct spi_board_info *info)
> {
> struct v4l2_subdev *sd = NULL;
> struct spi_device *spi = NULL;
> @@ -46,7 +47,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
>
> spi = spi_new_device(master, info);
>
> - if (spi == NULL || spi->dev.driver == NULL)
> + if (!spi || !spi->dev.driver)
> goto error;
>
> if (!try_module_get(spi->dev.driver->owner))
> @@ -54,8 +55,10 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
>
> sd = spi_get_drvdata(spi);
>
> - /* Register with the v4l2_device which increases the module's
> - use count as well. */
> + /*
> + * Register with the v4l2_device which increases the module's
> + * use count as well.
> + */
> if (v4l2_device_register_subdev(v4l2_dev, sd))
> sd = NULL;
>
> @@ -63,8 +66,10 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
> module_put(spi->dev.driver->owner);
>
> error:
> - /* If we have a client but no subdev, then something went wrong and
> - we must unregister the client. */
> + /*
> + * If we have a client but no subdev, then something went wrong and
> + * we must unregister the client.
> + */
> if (!sd)
> spi_unregister_device(spi);
>
> --
> 2.21.0
>
--
Sakari Ailus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-26 14:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-26 14:03 [PATCH] v4l2-core: fix coding style for the two new c files Mauro Carvalho Chehab
2019-08-26 14:14 ` Sakari Ailus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).