mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
ide: ide-cd.c fix sparse endianness warnings
drivers/ide/ide-cd.c:1276:46: warning: Using plain integer as NULL pointer drivers/ide/ide-cd.c:1298:19: warning: cast to restricted __be32 drivers/ide/ide-cd.c:1300:4: warning: cast to restricted __be32 drivers/ide/ide-cd.c:1522:14: warning: cast to restricted __le16 drivers/ide/ide-cd.c:1523:14: warning: cast to restricted __le16 drivers/ide/ide-cd.c:1525:14: warning: cast to restricted __be16 drivers/ide/ide-cd.c:1526:14: warning: cast to restricted __be16 drivers/ide/ide-cd.c:1667:37: warning: cast to restricted __be16 Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Acked-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
570f89ea5f
commit
141d3b27fc
1 changed files with 8 additions and 11 deletions
|
@ -1284,7 +1284,7 @@ int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
|
|||
*/
|
||||
cmd[7] = cdi->sanyo_slot % 3;
|
||||
|
||||
return ide_cd_queue_pc(drive, cmd, 0, NULL, 0, sense, 0, REQ_QUIET);
|
||||
return ide_cd_queue_pc(drive, cmd, 0, NULL, NULL, sense, 0, REQ_QUIET);
|
||||
}
|
||||
|
||||
static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
|
||||
|
@ -1292,8 +1292,8 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
|
|||
struct request_sense *sense)
|
||||
{
|
||||
struct {
|
||||
__u32 lba;
|
||||
__u32 blocklen;
|
||||
__be32 lba;
|
||||
__be32 blocklen;
|
||||
} capbuf;
|
||||
|
||||
int stat;
|
||||
|
@ -1526,15 +1526,12 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)
|
|||
struct cdrom_info *cd = drive->driver_data;
|
||||
u16 curspeed, maxspeed;
|
||||
|
||||
curspeed = *(u16 *)&buf[8 + 14];
|
||||
maxspeed = *(u16 *)&buf[8 + 8];
|
||||
|
||||
if (drive->atapi_flags & IDE_AFLAG_LE_SPEED_FIELDS) {
|
||||
curspeed = le16_to_cpu(curspeed);
|
||||
maxspeed = le16_to_cpu(maxspeed);
|
||||
curspeed = le16_to_cpup((__le16 *)&buf[8 + 14]);
|
||||
maxspeed = le16_to_cpup((__le16 *)&buf[8 + 8]);
|
||||
} else {
|
||||
curspeed = be16_to_cpu(curspeed);
|
||||
maxspeed = be16_to_cpu(maxspeed);
|
||||
curspeed = be16_to_cpup((__be16 *)&buf[8 + 14]);
|
||||
maxspeed = be16_to_cpup((__be16 *)&buf[8 + 8]);
|
||||
}
|
||||
|
||||
cd->current_speed = (curspeed + (176/2)) / 176;
|
||||
|
@ -1675,7 +1672,7 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
|
|||
else
|
||||
printk(KERN_CONT " drive");
|
||||
|
||||
printk(KERN_CONT ", %dkB Cache\n", be16_to_cpu(*(u16 *)&buf[8 + 12]));
|
||||
printk(KERN_CONT ", %dkB Cache\n", be16_to_cpup((__be16 *)&buf[8 + 12]));
|
||||
|
||||
return nslots;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue