* [PATCH] ide: ide-cd.c fix sparse endianness warnings
@ 2008-07-03 23:34 Harvey Harrison
2008-07-06 7:25 ` Borislav Petkov
0 siblings, 1 reply; 4+ messages in thread
From: Harvey Harrison @ 2008-07-03 23:34 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Andrew Morton
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>
---
drivers/ide/ide-cd.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 9b4acbe..47c58a8 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1273,7 +1273,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,
@@ -1281,8 +1281,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;
@@ -1515,15 +1515,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->dev_flags & IDE_DFLAG_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;
@@ -1664,7 +1661,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;
}
--
1.5.6.1.281.g1087e
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ide: ide-cd.c fix sparse endianness warnings
2008-07-03 23:34 [PATCH] ide: ide-cd.c fix sparse endianness warnings Harvey Harrison
@ 2008-07-06 7:25 ` Borislav Petkov
2008-07-08 17:58 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2008-07-06 7:25 UTC (permalink / raw)
To: bzolnier, Harvey Harrison; +Cc: linux-ide, Andrew Morton
On Thu, Jul 03, 2008 at 04:34:45PM -0700, Harvey Harrison wrote:
> 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>
Acked-off-by: Borislav Petkov <petkovbb@gmail.com>
> ---
> drivers/ide/ide-cd.c | 19 ++++++++-----------
> 1 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
> index 9b4acbe..47c58a8 100644
> --- a/drivers/ide/ide-cd.c
> +++ b/drivers/ide/ide-cd.c
> @@ -1273,7 +1273,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,
> @@ -1281,8 +1281,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;
> @@ -1515,15 +1515,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->dev_flags & IDE_DFLAG_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;
> @@ -1664,7 +1661,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;
> }
> --
> 1.5.6.1.281.g1087e
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ide" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Regards/Gruß,
Boris.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ide: ide-cd.c fix sparse endianness warnings
2008-07-06 7:25 ` Borislav Petkov
@ 2008-07-08 17:58 ` Bartlomiej Zolnierkiewicz
2008-07-08 20:56 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-07-08 17:58 UTC (permalink / raw)
To: petkovbb; +Cc: Harvey Harrison, linux-ide, Andrew Morton
On Sunday 06 July 2008, Borislav Petkov wrote:
> On Thu, Jul 03, 2008 at 04:34:45PM -0700, Harvey Harrison wrote:
> > 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>
>
> Acked-off-by: Borislav Petkov <petkovbb@gmail.com>
applied
BTW ide-cd & co can as well use kernel typedefs (without "__" prefix)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ide: ide-cd.c fix sparse endianness warnings
2008-07-08 17:58 ` Bartlomiej Zolnierkiewicz
@ 2008-07-08 20:56 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-07-08 20:56 UTC (permalink / raw)
To: petkovbb; +Cc: Harvey Harrison, linux-ide, Andrew Morton
On Tuesday 08 July 2008, Bartlomiej Zolnierkiewicz wrote:
> BTW ide-cd & co can as well use kernel typedefs (without "__" prefix)
Please disregard this comment w.r.t. annotations
(somehow I was thinking about __u8 in ide-cd.h instead).
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-07-08 20:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-03 23:34 [PATCH] ide: ide-cd.c fix sparse endianness warnings Harvey Harrison
2008-07-06 7:25 ` Borislav Petkov
2008-07-08 17:58 ` Bartlomiej Zolnierkiewicz
2008-07-08 20:56 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).