2021-06-21 11:41:39

by Dongliang Mu

[permalink] [raw]
Subject: [PATCH 1/3 v2] media: dvb-usb: break long strings in dvb_usb_device_init

Break long strings into multiple lines.

Signed-off-by: Dongliang Mu <[email protected]>
---
drivers/media/usb/dvb-usb/dvb-usb-init.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index 28e1fd64dd3c..edc477cedaa9 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -286,13 +286,15 @@ int dvb_usb_device_init(struct usb_interface *intf,

desc = dvb_usb_find_device(udev, &d->props, &cold);
if (!desc) {
- deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
+ deb_err("something went very wrong, "
+ "device was not found in current device list.\n");
ret = -ENODEV;
goto error;
}

if (cold) {
- info("found a '%s' in cold state, will try to load a firmware", desc->name);
+ info("found a %s in cold state, will try to load a firmware",
+ desc->name);
ret = dvb_usb_download_firmware(udev, props);
if (!props->no_reconnect || ret != 0)
goto error;
@@ -314,7 +316,7 @@ int dvb_usb_device_init(struct usb_interface *intf,
if (du)
*du = d;

- info("%s successfully initialized and connected.", desc->name);
+ info("%s is successfully initialized and connected.", desc->name);
return 0;

error:
--
2.25.1


2021-07-13 08:54:48

by Sean Young

[permalink] [raw]
Subject: Re: [PATCH 1/3 v2] media: dvb-usb: break long strings in dvb_usb_device_init

On Mon, Jun 21, 2021 at 07:39:59PM +0800, Dongliang Mu wrote:
> Break long strings into multiple lines.
>
> Signed-off-by: Dongliang Mu <[email protected]>
> ---
> drivers/media/usb/dvb-usb/dvb-usb-init.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
> index 28e1fd64dd3c..edc477cedaa9 100644
> --- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
> +++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
> @@ -286,13 +286,15 @@ int dvb_usb_device_init(struct usb_interface *intf,
>
> desc = dvb_usb_find_device(udev, &d->props, &cold);
> if (!desc) {
> - deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
> + deb_err("something went very wrong, "
> + "device was not found in current device list.\n");

Long lines are acceptable unto 100 columns or more if they are string
constants. Breaking them up does not increase readability.

> ret = -ENODEV;
> goto error;
> }
>
> if (cold) {
> - info("found a '%s' in cold state, will try to load a firmware", desc->name);
> + info("found a %s in cold state, will try to load a firmware",
> + desc->name);

No reason for removing the quotes, I think.

> ret = dvb_usb_download_firmware(udev, props);
> if (!props->no_reconnect || ret != 0)
> goto error;
> @@ -314,7 +316,7 @@ int dvb_usb_device_init(struct usb_interface *intf,
> if (du)
> *du = d;
>
> - info("%s successfully initialized and connected.", desc->name);
> + info("%s is successfully initialized and connected.", desc->name);

"is" doesn't really add anything here, and the message is fine without it.

> return 0;
>
> error:
> --
> 2.25.1

2021-07-13 13:17:07

by Dongliang Mu

[permalink] [raw]
Subject: Re: [PATCH 1/3 v2] media: dvb-usb: break long strings in dvb_usb_device_init

On Tue, Jul 13, 2021 at 4:53 PM Sean Young <[email protected]> wrote:
>
> On Mon, Jun 21, 2021 at 07:39:59PM +0800, Dongliang Mu wrote:
> > Break long strings into multiple lines.
> >
> > Signed-off-by: Dongliang Mu <[email protected]>
> > ---
> > drivers/media/usb/dvb-usb/dvb-usb-init.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
> > index 28e1fd64dd3c..edc477cedaa9 100644
> > --- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
> > +++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
> > @@ -286,13 +286,15 @@ int dvb_usb_device_init(struct usb_interface *intf,
> >
> > desc = dvb_usb_find_device(udev, &d->props, &cold);
> > if (!desc) {
> > - deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
> > + deb_err("something went very wrong, "
> > + "device was not found in current device list.\n");
>
> Long lines are acceptable unto 100 columns or more if they are string
> constants. Breaking them up does not increase readability.

I see. Thanks for your comments. They are valuable to me.

>
> > ret = -ENODEV;
> > goto error;
> > }
> >
> > if (cold) {
> > - info("found a '%s' in cold state, will try to load a firmware", desc->name);
> > + info("found a %s in cold state, will try to load a firmware",
> > + desc->name);
>
> No reason for removing the quotes, I think.
>
> > ret = dvb_usb_download_firmware(udev, props);
> > if (!props->no_reconnect || ret != 0)
> > goto error;
> > @@ -314,7 +316,7 @@ int dvb_usb_device_init(struct usb_interface *intf,
> > if (du)
> > *du = d;
> >
> > - info("%s successfully initialized and connected.", desc->name);
> > + info("%s is successfully initialized and connected.", desc->name);
>
> "is" doesn't really add anything here, and the message is fine without it.
>
> > return 0;
> >
> > error:
> > --
> > 2.25.1