Re: [U-Boot] [PATCH 18/30] dm: block: Rename device number member dev to devnum
Hi Stephen, On 16 February 2016 at 16:23, Stephen Warren wrote: > On 02/14/2016 07:16 PM, Simon Glass wrote: >> >> This is a device number, and we want to use 'dev' to mean a driver model >> device. Rename the member. > > >> 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: >> type_name = "null"; >> break; >> } > > > Should that be part of the earlier cbfs fix patch? > Yes, will move it. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 18/30] dm: block: Rename device number member dev to devnum
On 02/14/2016 07:16 PM, Simon Glass wrote: This is a device number, and we want to use 'dev' to mean a driver model device. Rename the member. 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: type_name = "null"; break; } Should that be part of the earlier cbfs fix patch? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 18/30] dm: block: Rename device number member dev to devnum
Hi Simon,
On Mon, Feb 15, 2016 at 10:16 AM, Simon Glass 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
> ---
>
> 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
Regards,
Bin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 18/30] dm: block: Rename device number member dev to devnum
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
---
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:
type_name = "null";
break;
}
diff --git a/cmd/disk.c b/cmd/disk.c
index 0883c79..27ed115 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -45,7 +45,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int
argc,
return 1;
}
- dev = dev_desc->dev;
+ dev = dev_desc->devnum;
bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
printf("\nLoading from %s device %d, partition %d: "
diff --git a/cmd/fat.c b/cmd/fat.c
index 18a1be9..4e20746 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -81,7 +81,7 @@ static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc,
if (part < 0)
return 1;
- dev = dev_desc->dev;
+ dev = dev_desc->devnum;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
printf("\n** Unable to use %s %d:%d for fatinfo **\n",
argv[1], dev, part);
@@ -118,7 +118,7 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
if (part < 0)
return 1;
- dev = dev_desc->dev;
+ dev = dev_desc->devnum;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
printf("\n** Unable to use %s %d:%d for fatwrite **\n",
diff --git a/cmd/ide.c b/cmd/ide.c
index 01b91b5..dfd5548 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -418,7 +418,7 @@ void ide_init(void)
int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
ide_dev_desc[i].if_type = IF_TYPE_IDE;
- ide_dev_desc[i].dev = i;
+ ide_dev_desc[i].devnum = i;
ide_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
ide_dev_desc[i].blksz = 0;
ide_dev_desc[i].log2blksz =
@@ -551,7 +551,7 @@ static void ide_ident(struct blk_desc *dev_desc)
#endif
int device;
- device = dev_desc->dev;
+ device = dev_desc->devnum;
printf(" Device %d: ", device);
ide_led(DEVICE_LED(device), 1); /* LED on */
@@ -716,7 +716,7 @@ static void ide_ident(struct blk_desc *dev_desc)
ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
void *buffer)
{
- int device = block_dev->dev;
+ int device = block_dev->devnum;
ulong n = 0;
unsigned char c;
unsigned char pwrsave = 0; /* power save */
@@ -842,7 +842,7 @@ IDE_READ_E:
ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
const void *buffer)
{
- int device = block_dev->dev;
+ int device = block_dev->devnum;
ulong n
