Skip to contentSkip to conversation

cdrom: remove extraneous braces to comply with coding style.

PATCH New Michael Rawson 1 participant 1 message Dec 25, 2012 Uniform cdrom driver

lore
Share & tools
lore

Michael Rawson

author
#0 lore raw

PATCH 1/1 cdrom: remove extraneous braces to comply with coding style.

Hi list, Jens.
Please note that I'm a kernel newbie, hope I'm not about to embarrass myself. :-)

From https://github.com/torvalds/linux/blob/master/Documentation/CodingStyle:

"Printing numbers in parentheses (%d) adds no value and should be avoided."

I saw a couple of parenthesized messages in the cdrom driver I was looking at, have edited them out as a first patch. I intend this for the mainline branch, though given the patch content I can't see a reason why it wouldn't work elsewhere.

Patch follows:

drivers/cdrom/cdrom.c +5 -5
@@ -1759,7 +1759,7 @@ static int dvd_do_auth(struct cdrom_devi
 		break;
 
 	default:
-		cdinfo(CD_WARNING, "Invalid DVD key ioctl (%d)\n", ai->type);
+		cdinfo(CD_WARNING, "Invalid DVD key ioctl %d\n", ai->type);
 		return -ENOTTY;
 	}
 

@@ -1891,7 +1891,7 @@ static int dvd_read_bca(struct cdrom_dev
 
 	s->bca.len = buf[0] << 8 | buf[1];
 	if (s->bca.len < 12 || s->bca.len > 188) {
-		cdinfo(CD_WARNING, "Received invalid BCA length (%d)\n", s->bca.len);
+		cdinfo(CD_WARNING, "Received invalid BCA length %d\n", s->bca.len);
 		ret = -EIO;
 		goto out;
 	}

@@ -1928,12 +1928,12 @@ static int dvd_read_manufact(struct cdro
 	s->manufact.len = buf[0] << 8 | buf[1];
 	if (s->manufact.len < 0) {
 		cdinfo(CD_WARNING, "Received invalid manufacture info length"
-				   " (%d)\n", s->manufact.len);
+				   " %d\n", s->manufact.len);
 		ret = -EIO;
 	} else {
 		if (s->manufact.len > 2048) {
 			cdinfo(CD_WARNING, "Received invalid manufacture info "
-					"length (%d): truncating to 2048\n",
+					"length %d: truncating to 2048\n",
 					s->manufact.len);
 			s->manufact.len = 2048;
 		}

@@ -1965,7 +1965,7 @@ static int dvd_read_struct(struct cdrom_
 		return dvd_read_manufact(cdi, s, cgc);
 		
 	default:
-		cdinfo(CD_WARNING, ": Invalid DVD structure read requested (%d)\n",
+		cdinfo(CD_WARNING, ": Invalid DVD structure read requested %d\n",
 					s->type);
 		return -EINVAL;
 	}

"Signed-off-by: Michael Rawson <[email protected]>"

If you guys think it's unimportant, appreciated, but suggestions on a better first patch would be good too. Thanks for attention, criticism on submission would be appreciated.

Happy Christmas (or just have a good day if not),

Michael.