[MTD] mtdchar.c remove shadowed variable warnings
Use einfo, oinfo for the inner erase_info and otp_info structs used in individual case statements. drivers/mtd/mtdchar.c:582:26: warning: symbol 'info' shadows an earlier one drivers/mtd/mtdchar.c:380:23: originally declared here drivers/mtd/mtdchar.c:596:26: warning: symbol 'info' shadows an earlier one drivers/mtd/mtdchar.c:380:23: originally declared here drivers/mtd/mtdchar.c:704:19: warning: symbol 'info' shadows an earlier one drivers/mtd/mtdchar.c:380:23: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Родитель
5f6928378b
Коммит
175428b2b3
|
@ -577,29 +577,29 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
|
|||
|
||||
case MEMLOCK:
|
||||
{
|
||||
struct erase_info_user info;
|
||||
struct erase_info_user einfo;
|
||||
|
||||
if (copy_from_user(&info, argp, sizeof(info)))
|
||||
if (copy_from_user(&einfo, argp, sizeof(einfo)))
|
||||
return -EFAULT;
|
||||
|
||||
if (!mtd->lock)
|
||||
ret = -EOPNOTSUPP;
|
||||
else
|
||||
ret = mtd->lock(mtd, info.start, info.length);
|
||||
ret = mtd->lock(mtd, einfo.start, einfo.length);
|
||||
break;
|
||||
}
|
||||
|
||||
case MEMUNLOCK:
|
||||
{
|
||||
struct erase_info_user info;
|
||||
struct erase_info_user einfo;
|
||||
|
||||
if (copy_from_user(&info, argp, sizeof(info)))
|
||||
if (copy_from_user(&einfo, argp, sizeof(einfo)))
|
||||
return -EFAULT;
|
||||
|
||||
if (!mtd->unlock)
|
||||
ret = -EOPNOTSUPP;
|
||||
else
|
||||
ret = mtd->unlock(mtd, info.start, info.length);
|
||||
ret = mtd->unlock(mtd, einfo.start, einfo.length);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -699,15 +699,15 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
|
|||
|
||||
case OTPLOCK:
|
||||
{
|
||||
struct otp_info info;
|
||||
struct otp_info oinfo;
|
||||
|
||||
if (mfi->mode != MTD_MODE_OTP_USER)
|
||||
return -EINVAL;
|
||||
if (copy_from_user(&info, argp, sizeof(info)))
|
||||
if (copy_from_user(&oinfo, argp, sizeof(oinfo)))
|
||||
return -EFAULT;
|
||||
if (!mtd->lock_user_prot_reg)
|
||||
return -EOPNOTSUPP;
|
||||
ret = mtd->lock_user_prot_reg(mtd, info.start, info.length);
|
||||
ret = mtd->lock_user_prot_reg(mtd, oinfo.start, oinfo.length);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче