Staging: replace pr_err with dev_err

This patch replace pr_err with dev_err, when appropriate device structre is found.
Issue found using the following Coccinelle script:

@r exists@
identifier f, s, i;
position p;
@@

f(...,struct s *i,...) {
<+...
when != i == NULL
pr_err@p(...);
...+>
}

@rr@
identifier r.s, fld;
@@

struct s {
        ...
        struct device *fld;
        ...
};

@@
identifier r.i, rr.fld;
position r.p;
@@

(quoted diff) +2 -1

-pr_err@p
+dev_err
   (
+ i->fld,

...)

Signed-off-by Haneen Mohammed <[email protected]>

---
 drivers/staging/iio/resolver/ad2s1210.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

drivers/staging/iio/resolver/ad2s1210.c +6 -4

index b4c14ba..1d8c5c0 100644
@@ -214,7 +214,7 @@ static ssize_t ad2s1210_store_fclkin(struct device *dev,
        if (ret)
                return ret;
        if (fclkin < AD2S1210_MIN_CLKIN || fclkin > AD2S1210_MAX_CLKIN) {
-               pr_err("ad2s1210: fclkin out of range\n");
+               dev_err(dev, "ad2s1210: fclkin out of range\n");
                return -EINVAL;
        }
 

@@ -252,7 +252,8 @@ static ssize_t ad2s1210_store_fexcit(struct device *dev,
        if (ret < 0)
                return ret;
        if (fexcit < AD2S1210_MIN_EXCIT || fexcit > AD2S1210_MAX_EXCIT) {
-               pr_err("ad2s1210: excitation frequency out of range\n");
+               dev_err(dev,
+                       "ad2s1210: excitation frequency out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

@@ -307,7 +308,8 @@ static ssize_t ad2s1210_store_control(struct device *dev,
                goto error_ret;
        if (ret & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: write control register fail\n");
+               dev_err(dev,
+                       "ad2s1210: write control register fail\n");
                goto error_ret;
        }
        st->resolution

@@ -346,7 +348,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
 
        ret = kstrtou8(buf, 10, &udata);
        if (ret || udata < 10 || udata > 16) {
-               pr_err("ad2s1210: resolution out of range\n");
+               dev_err(dev, "ad2s1210: resolution out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

Quoted 36 lines · Haneen Mohammed

This patch replace pr_err with dev_err, when appropriate device structre is found.
Issue found using the following Coccinelle script:

@r exists@
identifier f, s, i;
position p;
@@

f(...,struct s *i,...) {
<+...
when != i == NULL
pr_err@p(...);
...+>
}

@rr@
identifier r.s, fld;
@@

struct s {
        ...
        struct device *fld;
        ...
};

@@
identifier r.i, rr.fld;
position r.p;
@@

(quoted diff) +2 -1

-pr_err@p
+dev_err
   (
+ i->fld,

...)

Quoted 1 line

Signed-off-by Haneen Mohammed <[email protected]>

Hi Haneen,

There are a lot of other pr_err instances in that file that you can convert to dev_err.

E.g
ad2s1210_update_frequency_control_word

You could use the st->sdev->dev. This applies for your changes below, too.

Quoted 49 lines

---
 drivers/staging/iio/resolver/ad2s1210.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

drivers/staging/iio/resolver/ad2s1210.c +6 -4

index b4c14ba..1d8c5c0 100644
@@ -214,7 +214,7 @@ static ssize_t ad2s1210_store_fclkin(struct device *dev,
        if (ret)
                return ret;
        if (fclkin < AD2S1210_MIN_CLKIN || fclkin > AD2S1210_MAX_CLKIN) {
-               pr_err("ad2s1210: fclkin out of range\n");
+               dev_err(dev, "ad2s1210: fclkin out of range\n");
                return -EINVAL;
        }
 

@@ -252,7 +252,8 @@ static ssize_t ad2s1210_store_fexcit(struct device *dev,
        if (ret < 0)
                return ret;
        if (fexcit < AD2S1210_MIN_EXCIT || fexcit > AD2S1210_MAX_EXCIT) {
-               pr_err("ad2s1210: excitation frequency out of range\n");
+               dev_err(dev,
+                       "ad2s1210: excitation frequency out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

@@ -307,7 +308,8 @@ static ssize_t ad2s1210_store_control(struct device *dev,
                goto error_ret;
        if (ret & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: write control register fail\n");
+               dev_err(dev,
+                       "ad2s1210: write control register fail\n");
                goto error_ret;
        }
        st->resolution

@@ -346,7 +348,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
 
        ret = kstrtou8(buf, 10, &udata);
        if (ret || udata < 10 || udata > 16) {
-               pr_err("ad2s1210: resolution out of range\n");
+               dev_err(dev, "ad2s1210: resolution out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

drivers/staging/iio/resolver/ad2s1210.c static ssize_t ad2s1210_store_resolution(struct device *dev, · line 376

Quoted 8 lines

drivers/staging/iio/resolver/ad2s1210.c +1 -1

@@ -368,7 +370,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
        data = ret;
        if (data & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: setting resolution fail\n");
+               dev_err(dev, "ad2s1210: setting resolution fail\n");
                goto error_ret;
        }
        st->resolution

thanks,
Daniel.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAEnQRZA4fAKcA%3DVh5DRCHfh%3DWjB1HnhySffgkgu%2B6-9Qfu6orA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 45 lines · Daniel Baluta

Quoted 36 lines · Haneen Mohammed

This patch replace pr_err with dev_err, when appropriate device structre is found.
Issue found using the following Coccinelle script:

@r exists@
identifier f, s, i;
position p;
@@

f(...,struct s *i,...) {
<+...
when != i == NULL
pr_err@p(...);
...+>
}

@rr@
identifier r.s, fld;
@@

struct s {
        ...
        struct device *fld;
        ...
};

@@
identifier r.i, rr.fld;
position r.p;
@@

(quoted diff) +2 -1

-pr_err@p
+dev_err
   (
+ i->fld,

...)

Quoted 1 line

Signed-off-by Haneen Mohammed <[email protected]>

Hi Haneen,

There are a lot of other pr_err instances in that file that you can convert to dev_err.

Quoted 4 lines

E.g
ad2s1210_update_frequency_control_word

You could use the st->sdev->dev. This applies for your changes below, too.

Maybe this is related to the lack of --all-includes.

julia

Quoted 67 lines

Quoted 49 lines

---
 drivers/staging/iio/resolver/ad2s1210.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

drivers/staging/iio/resolver/ad2s1210.c +6 -4

index b4c14ba..1d8c5c0 100644
@@ -214,7 +214,7 @@ static ssize_t ad2s1210_store_fclkin(struct device *dev,
        if (ret)
                return ret;
        if (fclkin < AD2S1210_MIN_CLKIN || fclkin > AD2S1210_MAX_CLKIN) {
-               pr_err("ad2s1210: fclkin out of range\n");
+               dev_err(dev, "ad2s1210: fclkin out of range\n");
                return -EINVAL;
        }
 

@@ -252,7 +252,8 @@ static ssize_t ad2s1210_store_fexcit(struct device *dev,
        if (ret < 0)
                return ret;
        if (fexcit < AD2S1210_MIN_EXCIT || fexcit > AD2S1210_MAX_EXCIT) {
-               pr_err("ad2s1210: excitation frequency out of range\n");
+               dev_err(dev,
+                       "ad2s1210: excitation frequency out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

@@ -307,7 +308,8 @@ static ssize_t ad2s1210_store_control(struct device *dev,
                goto error_ret;
        if (ret & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: write control register fail\n");
+               dev_err(dev,
+                       "ad2s1210: write control register fail\n");
                goto error_ret;
        }
        st->resolution

@@ -346,7 +348,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
 
        ret = kstrtou8(buf, 10, &udata);
        if (ret || udata < 10 || udata > 16) {
-               pr_err("ad2s1210: resolution out of range\n");
+               dev_err(dev, "ad2s1210: resolution out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

drivers/staging/iio/resolver/ad2s1210.c static ssize_t ad2s1210_store_resolution(struct device *dev, · line 376

Quoted 8 lines

drivers/staging/iio/resolver/ad2s1210.c +1 -1

@@ -368,7 +370,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
        data = ret;
        if (data & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: setting resolution fail\n");
+               dev_err(dev, "ad2s1210: setting resolution fail\n");
                goto error_ret;
        }
        st->resolution

thanks,
Daniel.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAEnQRZA4fAKcA%3DVh5DRCHfh%3DWjB1HnhySffgkgu%2B6-9Qfu6orA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 52 lines · Julia Lawall

Quoted 48 lines · Daniel Baluta

Quoted 36 lines · Haneen Mohammed

This patch replace pr_err with dev_err, when appropriate device structre is found.
Issue found using the following Coccinelle script:

@r exists@
identifier f, s, i;
position p;
@@

f(...,struct s *i,...) {
<+...
when != i == NULL
pr_err@p(...);
...+>
}

@rr@
identifier r.s, fld;
@@

struct s {
        ...
        struct device *fld;
        ...
};

@@
identifier r.i, rr.fld;
position r.p;
@@

(quoted diff) +2 -1

-pr_err@p
+dev_err
   (
+ i->fld,

...)

Quoted 1 line

Signed-off-by Haneen Mohammed <[email protected]>

Hi Haneen,

There are a lot of other pr_err instances in that file that you can convert to dev_err.

E.g
ad2s1210_update_frequency_control_word

Quoted 6 lines

Quoted 1 line

You could use the st->sdev->dev. This applies for your changes below, too.

Maybe this is related to the lack of --all-includes.

julia

I did use --all-includes :) this is what I used:

$ spatch --sp-file ../pr3.cocci   --all-includes -I include/ --dir
drivers/staging/ > ../pr4.out

This was hinted in this video, becuase without it I didn't get any result:
https://www.youtube.com/watch?v=4uhHhKTOHDs

But I think I need to refine the script to include other cases. Also, I needed to manulaly adjust some of the outputs such as when the device struct is what was passed in the function, becuase for that I got the following in comedi/comedi_fops.c:
dev_err(hardware_device->parent,
"ran out of minor numbers for board device
files\n");

And I got two outputs that I couldn't confirm if there were a device struct, such as "dev_err(port->dev," from panel/panel.c file and dev_err(mc_io->dev, from fsl-mc/bus/mc-bus.c

Quoted 60 lines

Quoted 60 lines

Quoted 49 lines

---
 drivers/staging/iio/resolver/ad2s1210.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

drivers/staging/iio/resolver/ad2s1210.c +6 -4

index b4c14ba..1d8c5c0 100644
@@ -214,7 +214,7 @@ static ssize_t ad2s1210_store_fclkin(struct device *dev,
        if (ret)
                return ret;
        if (fclkin < AD2S1210_MIN_CLKIN || fclkin > AD2S1210_MAX_CLKIN) {
-               pr_err("ad2s1210: fclkin out of range\n");
+               dev_err(dev, "ad2s1210: fclkin out of range\n");
                return -EINVAL;
        }
 

@@ -252,7 +252,8 @@ static ssize_t ad2s1210_store_fexcit(struct device *dev,
        if (ret < 0)
                return ret;
        if (fexcit < AD2S1210_MIN_EXCIT || fexcit > AD2S1210_MAX_EXCIT) {
-               pr_err("ad2s1210: excitation frequency out of range\n");
+               dev_err(dev,
+                       "ad2s1210: excitation frequency out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

@@ -307,7 +308,8 @@ static ssize_t ad2s1210_store_control(struct device *dev,
                goto error_ret;
        if (ret & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: write control register fail\n");
+               dev_err(dev,
+                       "ad2s1210: write control register fail\n");
                goto error_ret;
        }
        st->resolution

@@ -346,7 +348,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
 
        ret = kstrtou8(buf, 10, &udata);
        if (ret || udata < 10 || udata > 16) {
-               pr_err("ad2s1210: resolution out of range\n");
+               dev_err(dev, "ad2s1210: resolution out of range\n");
                return -EINVAL;
        }
        mutex_lock(&st->lock);

drivers/staging/iio/resolver/ad2s1210.c static ssize_t ad2s1210_store_resolution(struct device *dev, · line 376

Quoted 8 lines

drivers/staging/iio/resolver/ad2s1210.c +1 -1

@@ -368,7 +370,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
        data = ret;
        if (data & AD2S1210_MSB_IS_HIGH) {
                ret = -EIO;
-               pr_err("ad2s1210: setting resolution fail\n");
+               dev_err(dev, "ad2s1210: setting resolution fail\n");
                goto error_ret;
        }
        st->resolution

thanks,
Daniel.

Quoted 7 lines

Quoted 7 lines

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAEnQRZA4fAKcA%3DVh5DRCHfh%3DWjB1HnhySffgkgu%2B6-9Qfu6orA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20150317111042.GA24753%40haneen-vb.
For more options, visit https://groups.google.com/d/optout.

This patch replace pr_err with dev_err, when appropriate device structure is found.

Issue found using the following Coccinelle script:

@r exists@
identifier f, s, i;
position p;
@@

f(...,struct s *i,...) {
<+...
when != i == NULL
pr_err@p(...);
...+>
}

@rr@
identifier r.s, fld;
@@

struct s {
	...
	struct device *fld;
	...
};

@@
identifier r.i, rr.fld;
position r.p;
@@

(quoted diff) +2 -1

-pr_err@p
+dev_err
   (
+ i->fld,

...)

Signed-off-by Haneen Mohammed <[email protected]>

---
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +3 -3

index a6b55f4..3b303b6 100644
@@ -136,7 +136,7 @@ static int ft1000_probe(struct usb_interface *interface,
 
 	ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev);
 	if (ret < 0) {
-		pr_err("Error request_firmware()\n");
+		dev_err(interface->usb_dev, "Error request_firmware()\n");
 		goto err_fw;
 	}
 

@@ -164,7 +164,8 @@ static int ft1000_probe(struct usb_interface *interface,
 	pr_debug("pft1000info=%p\n", pft1000info);
 	ret = dsp_reload(ft1000dev);
 	if (ret) {
-		pr_err("Problem with DSP image loading\n");
+		dev_err(interface->usb_dev,
+			"Problem with DSP image loading\n");
 		goto err_load;
 	}
 
--

1.9.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1426570656-22498-1-git-send-email-hamohammed.sa%40gmail.com.
For more options, visit https://groups.google.com/d/optout.