On Wed, Jun 18, 2008 at 03:57:35PM -0700, Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
> ---
> drivers/ide/ide-floppy.c | 16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
> index f05fbc2..cba39fa 100644
> --- a/drivers/ide/ide-floppy.c
> +++ b/drivers/ide/ide-floppy.c
> @@ -921,10 +921,10 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
> set_disk_ro(floppy->disk, floppy->wp);
> page = &pc.buf[8];
>
> - transfer_rate = be16_to_cpu(*(u16 *)&pc.buf[8 + 2]);
> - sector_size = be16_to_cpu(*(u16 *)&pc.buf[8 + 6]);
> - cyls = be16_to_cpu(*(u16 *)&pc.buf[8 + 8]);
> - rpm = be16_to_cpu(*(u16 *)&pc.buf[8 + 28]);
> + transfer_rate = be16_to_cpup((__be16 *)&pc.buf[8 + 2]);
> + sector_size = be16_to_cpup((__be16 *)&pc.buf[8 + 6]);
> + cyls = be16_to_cpup((__be16 *)&pc.buf[8 + 8]);
> + rpm = be16_to_cpup((__be16 *)&pc.buf[8 + 28]);
Pointless, IMO - just s/u16/__be16/ in the above.
> - blocks = be32_to_cpu(*(u32 *)&pc.buf[desc_start]);
> - length = be16_to_cpu(*(u16 *)&pc.buf[desc_start + 6]);
> + blocks = be32_to_cpup((__be32 *)&pc.buf[desc_start]);
> + length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
Similar.
>
> debug_log("Descriptor %d: %dkB, %d blocks, %d sector size\n",
> i, blocks * length / 1024, blocks, length);
> @@ -1121,8 +1121,8 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
> if (u_index >= u_array_size)
> break; /* User-supplied buffer too small */
>
> - blocks = be32_to_cpu(*(u32 *)&pc.buf[desc_start]);
> - length = be16_to_cpu(*(u16 *)&pc.buf[desc_start + 6]);
> + blocks = be32_to_cpup((__be32 *)&pc.buf[desc_start]);
> + length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
Ditto.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
