part: nac: Use desc instead of dev_desc

The dev_ prefix is a hangover from the pre-driver model days. The device
is now a different thing, with driver model. Update the mac code to
just use 'desc'.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/disk/part_mac.c b/disk/part_mac.c
index ae8263f..db5e203 100644 (file)
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -31,21 +31,20 @@ extern ldiv_t ldiv (long int __numer, long int __denom);
 #endif
 
 
-static int part_mac_read_ddb(struct blk_desc *dev_desc,
-                            mac_driver_desc_t *ddb_p);
-static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
+static int part_mac_read_ddb(struct blk_desc *desc, mac_driver_desc_t *ddb_p);
+static int part_mac_read_pdb(struct blk_desc *desc, int part,
                             mac_partition_t *pdb_p);
 
 /*
  * Test for a valid MAC partition
  */
-static int part_test_mac(struct blk_desc *dev_desc)
+static int part_test_mac(struct blk_desc *desc)
 {
        ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1);
        ALLOC_CACHE_ALIGN_BUFFER(mac_partition_t, mpart, 1);
        ulong i, n;
 
-       if (part_mac_read_ddb (dev_desc, ddesc)) {
+       if (part_mac_read_ddb(desc, ddesc)) {
                /*
                 * error reading Driver Descriptor Block,
                 * or no valid Signature
@@ -55,8 +54,8 @@ static int part_test_mac(struct blk_desc *dev_desc)
 
        n = 1;  /* assuming at least one partition */
        for (i=1; i<=n; ++i) {
-               if ((blk_dread(dev_desc, i, 1, (ulong *)mpart) != 1) ||
-                   (mpart->signature != MAC_PARTITION_MAGIC) ) {
+               if ((blk_dread(desc, i, 1, (ulong *)mpart) != 1) ||
+                   mpart->signature != MAC_PARTITION_MAGIC) {
                        return (-1);
                }
                /* update partition count */
@@ -65,14 +64,14 @@ static int part_test_mac(struct blk_desc *dev_desc)
        return (0);
 }
 
-static void part_print_mac(struct blk_desc *dev_desc)
+static void part_print_mac(struct blk_desc *desc)
 {
        ulong i, n;
        ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1);
        ALLOC_CACHE_ALIGN_BUFFER(mac_partition_t, mpart, 1);
        ldiv_t mb, gb;
 
-       if (part_mac_read_ddb (dev_desc, ddesc)) {
+       if (part_mac_read_ddb(desc, ddesc)) {
                /*
                 * error reading Driver Descriptor Block,
                 * or no valid Signature
@@ -110,15 +109,15 @@ static void part_print_mac(struct blk_desc *dev_desc)
                char c;
 
                printf ("%4ld: ", i);
-               if (blk_dread(dev_desc, i, 1, (ulong *)mpart) != 1) {
+               if (blk_dread(desc, i, 1, (ulong *)mpart) != 1) {
                        printf ("** Can't read Partition Map on %d:%ld **\n",
-                               dev_desc->devnum, i);
+                               desc->devnum, i);
                        return;
                }
 
                if (mpart->signature != MAC_PARTITION_MAGIC) {
                        printf("** Bad Signature on %d:%ld - expected 0x%04x, got 0x%04x\n",
-                              dev_desc->devnum, i, MAC_PARTITION_MAGIC,
+                              desc->devnum, i, MAC_PARTITION_MAGIC,
                               mpart->signature);
                        return;
                }
@@ -154,10 +153,9 @@ static void part_print_mac(struct blk_desc *dev_desc)
 /*
  * Read Device Descriptor Block
  */
-static int part_mac_read_ddb(struct blk_desc *dev_desc,
-                            mac_driver_desc_t *ddb_p)
+static int part_mac_read_ddb(struct blk_desc *desc, mac_driver_desc_t *ddb_p)
 {
-       if (blk_dread(dev_desc, 0, 1, (ulong *)ddb_p) != 1) {
+       if (blk_dread(desc, 0, 1, (ulong *)ddb_p) != 1) {
                debug("** Can't read Driver Descriptor Block **\n");
                return (-1);
        }
@@ -171,7 +169,7 @@ static int part_mac_read_ddb(struct blk_desc *dev_desc,
 /*
  * Read Partition Descriptor Block
  */
-static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
+static int part_mac_read_pdb(struct blk_desc *desc, int part,
                             mac_partition_t *pdb_p)
 {
        int n = 1;
@@ -182,15 +180,15 @@ static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
                 * partition 1 first since this is the only way to
                 * know how many partitions we have.
                 */
-               if (blk_dread(dev_desc, n, 1, (ulong *)pdb_p) != 1) {
-                       printf ("** Can't read Partition Map on %d:%d **\n",
-                               dev_desc->devnum, n);
+               if (blk_dread(desc, n, 1, (ulong *)pdb_p) != 1) {
+                       printf("** Can't read Partition Map on %d:%d **\n",
+                              desc->devnum, n);
                        return (-1);
                }
 
                if (pdb_p->signature != MAC_PARTITION_MAGIC) {
                        printf("** Bad Signature on %d:%d: expected 0x%04x, got 0x%04x\n",
-                              dev_desc->devnum, n, MAC_PARTITION_MAGIC,
+                              desc->devnum, n, MAC_PARTITION_MAGIC,
                               pdb_p->signature);
                        return (-1);
                }
@@ -199,10 +197,9 @@ static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
                        return (0);
 
                if ((part < 1) || (part > pdb_p->map_count)) {
-                       printf ("** Invalid partition %d:%d [%d:1...%d:%d only]\n",
-                               dev_desc->devnum, part,
-                               dev_desc->devnum,
-                               dev_desc->devnum, pdb_p->map_count);
+                       printf("** Invalid partition %d:%d [%d:1...%d:%d only]\n",
+                              desc->devnum, part, desc->devnum, desc->devnum,
+                              pdb_p->map_count);
                        return (-1);
                }
 
@@ -213,21 +210,19 @@ static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
        /* NOTREACHED */
 }
 
-static int part_get_info_mac(struct blk_desc *dev_desc, int part,
-                                 struct disk_partition *info)
+static int part_get_info_mac(struct blk_desc *desc, int part,
+                            struct disk_partition *info)
 {
        ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1);
        ALLOC_CACHE_ALIGN_BUFFER(mac_partition_t, mpart, 1);
 
-       if (part_mac_read_ddb (dev_desc, ddesc)) {
-               return (-1);
-       }
+       if (part_mac_read_ddb(desc, ddesc))
+               return -1;
 
        info->blksz = ddesc->blk_size;
 
-       if (part_mac_read_pdb (dev_desc, part, mpart)) {
-               return (-1);
-       }
+       if (part_mac_read_pdb(desc, part, mpart))
+               return -1;
 
        info->start = mpart->start_block;
        info->size  = mpart->block_count;