diff options
author | Simon Glass | 2016-02-29 16:25:51 -0600 |
---|---|---|
committer | Simon Glass | 2016-03-14 16:34:50 -0500 |
commit | bcce53d048de7f41078d25e39aa2f26d752d3658 (patch) | |
tree | 5eb88ab671c7ec923cfb4fe9c0d3dc4715adb93d /disk/part_dos.c | |
parent | 782b97805e9f59cc2b4d3aa67a8a03248e8cd722 (diff) | |
download | u-boot-bcce53d048de7f41078d25e39aa2f26d752d3658.tar.gz u-boot-bcce53d048de7f41078d25e39aa2f26d752d3658.tar.xz u-boot-bcce53d048de7f41078d25e39aa2f26d752d3658.zip |
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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'disk/part_dos.c')
-rw-r--r-- | disk/part_dos.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/disk/part_dos.c b/disk/part_dos.c index 4a56391de7..5f8d949b84 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c | |||
@@ -114,7 +114,7 @@ static void print_partition_extended(struct blk_desc *dev_desc, | |||
114 | if (dev_desc->block_read(dev_desc, ext_part_sector, 1, | 114 | if (dev_desc->block_read(dev_desc, ext_part_sector, 1, |
115 | (ulong *)buffer) != 1) { | 115 | (ulong *)buffer) != 1) { |
116 | printf ("** Can't read partition table on %d:" LBAFU " **\n", | 116 | printf ("** Can't read partition table on %d:" LBAFU " **\n", |
117 | dev_desc->dev, ext_part_sector); | 117 | dev_desc->devnum, ext_part_sector); |
118 | return; | 118 | return; |
119 | } | 119 | } |
120 | i=test_block_type(buffer); | 120 | i=test_block_type(buffer); |
@@ -180,7 +180,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, | |||
180 | if (dev_desc->block_read(dev_desc, ext_part_sector, 1, | 180 | if (dev_desc->block_read(dev_desc, ext_part_sector, 1, |
181 | (ulong *)buffer) != 1) { | 181 | (ulong *)buffer) != 1) { |
182 | printf ("** Can't read partition table on %d:" LBAFU " **\n", | 182 | printf ("** Can't read partition table on %d:" LBAFU " **\n", |
183 | dev_desc->dev, ext_part_sector); | 183 | dev_desc->devnum, ext_part_sector); |
184 | return -1; | 184 | return -1; |
185 | } | 185 | } |
186 | if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 || | 186 | if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 || |
@@ -215,24 +215,29 @@ static int part_get_info_extended(struct blk_desc *dev_desc, | |||
215 | case IF_TYPE_IDE: | 215 | case IF_TYPE_IDE: |
216 | case IF_TYPE_SATA: | 216 | case IF_TYPE_SATA: |
217 | case IF_TYPE_ATAPI: | 217 | case IF_TYPE_ATAPI: |
218 | sprintf ((char *)info->name, "hd%c%d", | 218 | sprintf((char *)info->name, "hd%c%d", |
219 | 'a' + dev_desc->dev, part_num); | 219 | 'a' + dev_desc->devnum, |
220 | part_num); | ||
220 | break; | 221 | break; |
221 | case IF_TYPE_SCSI: | 222 | case IF_TYPE_SCSI: |
222 | sprintf ((char *)info->name, "sd%c%d", | 223 | sprintf((char *)info->name, "sd%c%d", |
223 | 'a' + dev_desc->dev, part_num); | 224 | 'a' + dev_desc->devnum, |
225 | part_num); | ||
224 | break; | 226 | break; |
225 | case IF_TYPE_USB: | 227 | case IF_TYPE_USB: |
226 | sprintf ((char *)info->name, "usbd%c%d", | 228 | sprintf((char *)info->name, "usbd%c%d", |
227 | 'a' + dev_desc->dev, part_num); | 229 | 'a' + dev_desc->devnum, |
230 | part_num); | ||
228 | break; | 231 | break; |
229 | case IF_TYPE_DOC: | 232 | case IF_TYPE_DOC: |
230 | sprintf ((char *)info->name, "docd%c%d", | 233 | sprintf((char *)info->name, "docd%c%d", |
231 | 'a' + dev_desc->dev, part_num); | 234 | 'a' + dev_desc->devnum, |
235 | part_num); | ||
232 | break; | 236 | break; |
233 | default: | 237 | default: |
234 | sprintf ((char *)info->name, "xx%c%d", | 238 | sprintf((char *)info->name, "xx%c%d", |
235 | 'a' + dev_desc->dev, part_num); | 239 | 'a' + dev_desc->devnum, |
240 | part_num); | ||
236 | break; | 241 | break; |
237 | } | 242 | } |
238 | /* sprintf(info->type, "%d, pt->sys_ind); */ | 243 | /* sprintf(info->type, "%d, pt->sys_ind); */ |