On Mon, Feb 23, 2009 at 08:04:13AM +0100, Borislav Petkov wrote:
> > Since it is not a lot of modified lines and the change is rather
> > straightforward it could as well be done in a single patch...
>
> here's version 2:
> --
> From: Borislav Petkov <petkovbb@xxxxxxxxx>
> Date: Mon, 23 Feb 2009 07:58:23 +0100
> Subject: [PATCH] ide: flags query macros
>
> Add drive->atapi_flags and drive->dev_flags macro wrappers
>
> v2:
> - use static inlines for better typechecking
> - use macro indirection for convenience
>
> Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx>
Version 2 looks much better - thanks.
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c
index df3df00..3553759 100644
--- a/drivers/ide/ide-cd_ioctl.c
+++ b/drivers/ide/ide-cd_ioctl.c
@@ -86,7 +86,7 @@ int ide_cdrom_check_media_change_real(struct cdrom_device_info *cdi,
if (slot_nr == CDSL_CURRENT) {
(void) cdrom_check_status(drive, NULL);
- retval = (drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED) ? 1 : 0;
+ retval = ide_dev_media_changed(drive) ? 1 : 0;
drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED;
return retval;
} else {
The use of ? 1 : 0; here is redundant.
if (drive->media == ide_disk) {
- printk(KERN_INFO "%s: non-IDE drive, CHS=%d/%d/%d\n",
+ pr_info("%s: non-IDE drive, CHS=%d/%d/%d\n",
drive->name, drive->cyl,
drive->head, drive->sect);
} else if (drive->media == ide_cdrom) {
- printk(KERN_INFO "%s: ATAPI cdrom (?)\n", drive->name);
+ pr_info("%s: ATAPI cdrom (?)\n", drive->name);
} else {
/* nuke it */
- printk(KERN_WARNING "%s: Unknown device on bus refused identification. Ignoring.\n",
+drive->name);
+ pr_warning("%s: Unknown device on bus refused "
+ "identification, ignoring.\n",
+ drive->name);
I did not see this addressed in the changelog?
drive->dev_flags &= ~IDE_DFLAG_PRESENT;
You have a nice set of inlines to facilitate testing bits,
but not for the above use?
I guess this was not worth the abstraction for now.
Sam
--
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
