[U-Boot] [PATCH 18/30] dm: block: Rename device number member dev to devnum

[Bin Meng]

Hi Simon,

On Mon, Feb 15, 2016 at 10:16 AM, Simon Glass <sjg at chromium.org> wrote:
> This is a device number, and we want to use 'dev' to mean a driver model
> device. Rename the member.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  board/sunxi/board.c          |  4 ++--
>  cmd/cbfs.c                   |  1 +
>  cmd/disk.c                   |  2 +-
>  cmd/fat.c                    |  4 ++--
>  cmd/ide.c                    | 12 ++++++------
>  cmd/mmc_spi.c                |  4 ++--
>  cmd/reiser.c                 |  4 ++--
>  cmd/sata.c                   |  6 +++---
>  cmd/scsi.c                   |  6 +++---
>  cmd/usb_mass_storage.c       |  2 +-
>  cmd/zfs.c                    |  2 +-
>  common/env_fat.c             |  4 ++--
>  common/fb_mmc.c              |  4 ++--
>  common/usb_storage.c         |  6 +++---
>  disk/part.c                  |  8 ++------
>  disk/part_dos.c              | 29 +++++++++++++++++------------
>  disk/part_efi.c              |  4 ++--
>  disk/part_iso.c              | 39 ++++++++++++++++++++-------------------
>  disk/part_mac.c              | 22 +++++++++++-----------
>  drivers/block/sandbox.c      |  6 +++---
>  drivers/block/systemace.c    |  2 +-
>  drivers/mmc/arm_pl180_mmci.c |  2 +-
>  drivers/mmc/mmc.c            |  8 ++++----
>  drivers/mmc/mmc_write.c      |  4 ++--
>  drivers/mmc/mxsmmc.c         | 24 ++++++++++++------------
>  drivers/mmc/omap_hsmmc.c     |  4 ++--
>  drivers/mmc/sdhci.c          |  2 +-
>  fs/fat/fat.c                 |  4 ++--
>  include/blk.h                |  2 +-
>  29 files changed, 112 insertions(+), 109 deletions(-)
>
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index 420481a..fd0cab9 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -336,8 +336,8 @@ int board_mmc_init(bd_t *bis)
>         if (!sunxi_mmc_has_egon_boot_signature(mmc0) &&
>             sunxi_mmc_has_egon_boot_signature(mmc1)) {
>                 /* Booting from emmc / mmc2, swap */
> -               mmc0->block_dev.dev = 1;
> -               mmc1->block_dev.dev = 0;
> +               mmc0->block_dev.devnum = 1;
> +               mmc1->block_dev.devnum = 0;
>         }
>  #endif
>
> diff --git a/cmd/cbfs.c b/cmd/cbfs.c
> index cdfc9b6..779e9c0 100644
> --- a/cmd/cbfs.c
> +++ b/cmd/cbfs.c
> @@ -141,6 +141,7 @@ int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
>                         type_name = "cmos layout";
>                         break;
>                 case -1:
> +               case 0:

Guess you didn't want this change (a git rebase ordering issue?)

>                         type_name = "null";
>                         break;
>                 }

[snip]

Other than that,
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>

Regards,
Bin