* grub-core/disk/diskfilter.c (insert_array): Remove scanner_name

	argument since it can be deduced from diskfilter. All users updated.

diff --git a/ChangeLog b/ChangeLog
index b441ad83cb35dd39f9a0f7f632300de01fc26120..5b5813869fc4ebfda2e9823126ffa33599dc8d6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/diskfilter.c (insert_array): Remove scanner_name
+       argument since it can be deduced from diskfilter.
+
 2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Remove prio_list.

diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index 875c7eae648fc9c27704eda317ab0ad126df76d3..dc9dc8ef3b31a326574f2cd60ca76bcc90a61d73 100644 (file)
--- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c
@@ -107,7 +107,7 @@ is_lv_readable (struct grub_diskfilter_lv *lv)
 static grub_err_t
 insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
              struct grub_diskfilter_vg *array,
-              grub_disk_addr_t start_sector, const char *scanner_name,
+              grub_disk_addr_t start_sector,
              grub_diskfilter_t diskfilter __attribute__ ((unused)));
 
 static int
@@ -146,8 +146,7 @@ scan_disk (const char *name)
          id.uuidlen = 0;
          arr = diskfilter->detect (disk, &id, &start_sector);
          if (arr &&
-             (! insert_array (disk, &id, arr, start_sector, diskfilter->name,
-                              diskfilter)))
+             (! insert_array (disk, &id, arr, start_sector, diskfilter)))
            {
              if (id.uuidlen)
                grub_free (id.uuid);
@@ -952,16 +951,16 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
 static grub_err_t
 insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
              struct grub_diskfilter_vg *array,
-              grub_disk_addr_t start_sector, const char *scanner_name,
+              grub_disk_addr_t start_sector,
              grub_diskfilter_t diskfilter __attribute__ ((unused)))
 {
   struct grub_diskfilter_pv *pv;
 
   grub_dprintf ("diskfilter", "Inserting %s into %s (%s)\n", disk->name,
-               array->name, scanner_name);
+               array->name, diskfilter->name);
 #ifdef GRUB_UTIL
   grub_util_info ("Inserting %s into %s (%s)\n", disk->name,
-                 array->name, scanner_name);
+                 array->name, diskfilter->name);
   array->driver = diskfilter;
 #endif