Patchwork Remove filename parameter from chip_safety_check()

login
register
about
Submitter David Hendricks
Date 2010-10-15 01:03:12
Message ID <AANLkTikMEHAPxjhRaUBJvaTOJea9q=Mdg12LHeZgByQn@mail.gmail.com>
Download mbox | patch
Permalink /patch/2111/
State Accepted
Commit 1302
Headers show

Comments

David Hendricks - 2010-10-15 01:03:12
Seems like the filename parameter was left in by accident.

This patch has only been compile tested.

Signed-off-by: David Hendricks <dhendrix@google.com>
Stefan Reinauer - 2010-10-18 23:10:46
* David Hendricks <dhendrix@google.com> [101015 03:03]:
> Seems like the filename parameter was left in by accident.
> 
> This patch has only been compile tested.
> 
> Signed-off-by: David Hendricks <dhendrix@google.com>
> 

Nice spotting!

Acked-by: Stefan Reinauer <stepan@coreboot.org>


> --
> David Hendricks (dhendrix)
> Systems Software Engineer, Google Inc.

> Index: flashrom-foo/flashrom.c
> ===================================================================
> --- flashrom-foo.orig/flashrom.c	2010-10-14 17:47:27.000000000 -0700
> +++ flashrom-foo/flashrom.c	2010-10-14 17:47:33.000000000 -0700
> @@ -1543,7 +1543,7 @@
>  /* FIXME: This function signature needs to be improved once doit() has a better
>   * function signature.
>   */
> -int chip_safety_check(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it)
> +int chip_safety_check(struct flashchip *flash, int force, int read_it, int write_it, int erase_it, int verify_it)
>  {
>  	if (!programmer_may_write && (write_it || erase_it)) {
>  		msg_perr("Write/erase is not working yet on your programmer in "
> @@ -1606,7 +1606,7 @@
>  	int ret = 0;
>  	unsigned long size;
>  
> -	if (chip_safety_check(flash, force, filename, read_it, write_it, erase_it, verify_it)) {
> +	if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) {
>  		msg_cerr("Aborting.\n");
>  		programmer_shutdown();
>  		return 1;
Stefan Tauner - 2011-05-18 01:40:05
hello

> * David Hendricks <dhendrix at google.com> [101015 03:03]:
> > Seems like the filename parameter was left in by accident.
> > 
> > This patch has only been compile tested.
> > 
> > Signed-off-by: David Hendricks <dhendrix at google.com>
> > 
> 
> Nice spotting!
> 
> Acked-by: Stefan Reinauer <stepan at coreboot.org>

applied in r1302

Patch

Index: flashrom-foo/flashrom.c
===================================================================
--- flashrom-foo.orig/flashrom.c	2010-10-14 17:47:27.000000000 -0700
+++ flashrom-foo/flashrom.c	2010-10-14 17:47:33.000000000 -0700
@@ -1543,7 +1543,7 @@ 
 /* FIXME: This function signature needs to be improved once doit() has a better
  * function signature.
  */
-int chip_safety_check(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it)
+int chip_safety_check(struct flashchip *flash, int force, int read_it, int write_it, int erase_it, int verify_it)
 {
 	if (!programmer_may_write && (write_it || erase_it)) {
 		msg_perr("Write/erase is not working yet on your programmer in "
@@ -1606,7 +1606,7 @@ 
 	int ret = 0;
 	unsigned long size;
 
-	if (chip_safety_check(flash, force, filename, read_it, write_it, erase_it, verify_it)) {
+	if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) {
 		msg_cerr("Aborting.\n");
 		programmer_shutdown();
 		return 1;