[patch ide-dev 4/9] add ide_task_init_flush() helper

[patch ide-dev 4/9] add ide_task_init_flush() helper

[Bartlomiej Zolnierkiewicz]

* add ide_task_init_flush() helper
* use it in do_idedisk_cacheflush() and ide_start_power_step()
* inline do_idedisk_cacheflush() into ide_cacheflush_p()

diff -Nru a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
--- a/drivers/ide/ide-disk.c	2005-02-19 17:22:58 +01:00
+++ b/drivers/ide/ide-disk.c	2005-02-19 17:22:58 +01:00
@@ -723,24 +723,6 @@
 	return 0;
 }

-static int do_idedisk_flushcache (ide_drive_t *drive)
-{
-	ide_task_t args;
-	struct ata_taskfile *tf = &args.tf;
-
-	memset(&args, 0, sizeof(ide_task_t));
-
-	if (ide_id_has_flush_cache_ext(drive->id)) {
-		tf->command = WIN_FLUSH_CACHE_EXT;
-		tf->flags |= ATA_TFLAG_LBA48;
-	} else
-		tf->command = WIN_FLUSH_CACHE;
-
-	args.command_type			= IDE_DRIVE_TASK_NO_DATA;
-	args.handler				= &task_no_data_intr;
-	return ide_raw_taskfile(drive, &args, NULL);
-}
-
 static int set_acoustic (ide_drive_t *drive, int arg)
 {
 	ide_task_t args;
@@ -931,10 +913,14 @@

 static void ide_cacheflush_p(ide_drive_t *drive)
 {
+	ide_task_t task;
+
 	if (!drive->wcache || !ide_id_has_flush_cache(drive->id))
 		return;

-	if (do_idedisk_flushcache(drive))
+	ide_task_init_flush(drive, &task);
+
+	if (ide_raw_taskfile(drive, &task, NULL))
 		printk(KERN_INFO "%s: wcache flush failed!\n", drive->name);
 }

diff -Nru a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
--- a/drivers/ide/ide-io.c	2005-02-19 17:22:58 +01:00
+++ b/drivers/ide/ide-io.c	2005-02-19 17:22:58 +01:00
@@ -55,6 +55,24 @@
 #include <asm/io.h>
 #include <asm/bitops.h>

+void ide_task_init_flush(ide_drive_t *drive, ide_task_t *task)
+{
+	struct ata_taskfile *tf = &task->tf;
+
+	memset(task, 0, sizeof(*task));
+
+	if (ide_id_has_flush_cache_ext(drive->id)) {
+		tf->command = WIN_FLUSH_CACHE_EXT;
+		tf->flags |= ATA_TFLAG_LBA48;
+	} else
+		tf->command = WIN_FLUSH_CACHE;
+
+	task->command_type = IDE_DRIVE_TASK_NO_DATA;
+	task->handler	   = &task_no_data_intr;
+}
+
+EXPORT_SYMBOL_GPL(ide_task_init_flush);
+
 static void ide_fill_flush_cmd(ide_drive_t *drive, struct request *rq)
 {
 	char *buf = rq->cmd;
@@ -247,14 +265,8 @@
 			return ide_stopped;
 		}

-		if (ide_id_has_flush_cache_ext(drive->id)) {
-			tf->command = WIN_FLUSH_CACHE_EXT;
-			tf->flags |= ATA_TFLAG_LBA48;
-		} else
-			tf->command = WIN_FLUSH_CACHE;
+		ide_task_init_flush(drive, args);

-		args->command_type = IDE_DRIVE_TASK_NO_DATA;
-		args->handler	   = &task_no_data_intr;
 		return do_rw_taskfile(drive, args);

 	case idedisk_pm_standby:	/* Suspend step 2 (standby) */
diff -Nru a/include/linux/ide.h b/include/linux/ide.h
--- a/include/linux/ide.h	2005-02-19 17:22:58 +01:00
+++ b/include/linux/ide.h	2005-02-19 17:22:58 +01:00
@@ -924,6 +924,19 @@
 typedef ide_startstop_t (ide_handler_t)(ide_drive_t *);
 typedef int (ide_expiry_t)(ide_drive_t *);

+typedef struct ide_task_s {
+	struct ata_taskfile	tf;
+	u16			data;
+	ide_reg_valid_t		tf_out_flags;
+	ide_reg_valid_t		tf_in_flags;
+	int			data_phase;
+	int			command_type;
+	ide_pre_handler_t	*prehandler;
+	ide_handler_t		*handler;
+	struct request		*rq;		/* copy of request */
+	void			*special;	/* valid_t generally */
+} ide_task_t;
+
 typedef struct hwgroup_s {
 		/* irq handler, if active */
 	ide_startstop_t	(*handler)(ide_drive_t *);
@@ -1189,6 +1202,8 @@
  */
 extern void ide_init_drive_cmd (struct request *rq);

+void ide_task_init_flush(ide_drive_t *, ide_task_t *);
+
 u64 ide_tf_get_address(struct ata_taskfile *);

 /*
@@ -1250,19 +1265,6 @@
  *  (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors, u8 *buf)
  */
 extern int ide_wait_cmd(ide_drive_t *, u8, u8, u8, u8, u8 *);
-
-typedef struct ide_task_s {
-	struct ata_taskfile	tf;
-	u16			data;
-	ide_reg_valid_t		tf_out_flags;
-	ide_reg_valid_t		tf_in_flags;
-	int			data_phase;
-	int			command_type;
-	ide_pre_handler_t	*prehandler;
-	ide_handler_t		*handler;
-	struct request		*rq;		/* copy of request */
-	void			*special;	/* valid_t generally */
-} ide_task_t;

 extern u32 ide_read_24(ide_drive_t *);

Re: [patch ide-dev 4/9] add ide_task_init_flush() helper

[Tejun Heo]

 Hello,

 Just one minor thing.  Doesn't moving ide_task_s upward belong to
patch #7?

On Thu, Feb 24, 2005 at 03:41:06PM +0100, Bartlomiej Zolnierkiewicz wrote:
> 
> * add ide_task_init_flush() helper
> * use it in do_idedisk_cacheflush() and ide_start_power_step()
> * inline do_idedisk_cacheflush() into ide_cacheflush_p()
> 
> diff -Nru a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
> --- a/drivers/ide/ide-disk.c	2005-02-19 17:22:58 +01:00
> +++ b/drivers/ide/ide-disk.c	2005-02-19 17:22:58 +01:00
> @@ -723,24 +723,6 @@
>  	return 0;
>  }
> 
> -static int do_idedisk_flushcache (ide_drive_t *drive)
> -{
> -	ide_task_t args;
> -	struct ata_taskfile *tf = &args.tf;
> -
> -	memset(&args, 0, sizeof(ide_task_t));
> -
> -	if (ide_id_has_flush_cache_ext(drive->id)) {
> -		tf->command = WIN_FLUSH_CACHE_EXT;
> -		tf->flags |= ATA_TFLAG_LBA48;
> -	} else
> -		tf->command = WIN_FLUSH_CACHE;
> -
> -	args.command_type			= IDE_DRIVE_TASK_NO_DATA;
> -	args.handler				= &task_no_data_intr;
> -	return ide_raw_taskfile(drive, &args, NULL);
> -}
> -
>  static int set_acoustic (ide_drive_t *drive, int arg)
>  {
>  	ide_task_t args;
> @@ -931,10 +913,14 @@
> 
>  static void ide_cacheflush_p(ide_drive_t *drive)
>  {
> +	ide_task_t task;
> +
>  	if (!drive->wcache || !ide_id_has_flush_cache(drive->id))
>  		return;
> 
> -	if (do_idedisk_flushcache(drive))
> +	ide_task_init_flush(drive, &task);
> +
> +	if (ide_raw_taskfile(drive, &task, NULL))
>  		printk(KERN_INFO "%s: wcache flush failed!\n", drive->name);
>  }
> 
> diff -Nru a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
> --- a/drivers/ide/ide-io.c	2005-02-19 17:22:58 +01:00
> +++ b/drivers/ide/ide-io.c	2005-02-19 17:22:58 +01:00
> @@ -55,6 +55,24 @@
>  #include <asm/io.h>
>  #include <asm/bitops.h>
> 
> +void ide_task_init_flush(ide_drive_t *drive, ide_task_t *task)
> +{
> +	struct ata_taskfile *tf = &task->tf;
> +
> +	memset(task, 0, sizeof(*task));
> +
> +	if (ide_id_has_flush_cache_ext(drive->id)) {
> +		tf->command = WIN_FLUSH_CACHE_EXT;
> +		tf->flags |= ATA_TFLAG_LBA48;
> +	} else
> +		tf->command = WIN_FLUSH_CACHE;
> +
> +	task->command_type = IDE_DRIVE_TASK_NO_DATA;
> +	task->handler	   = &task_no_data_intr;
> +}
> +
> +EXPORT_SYMBOL_GPL(ide_task_init_flush);
> +
>  static void ide_fill_flush_cmd(ide_drive_t *drive, struct request *rq)
>  {
>  	char *buf = rq->cmd;
> @@ -247,14 +265,8 @@
>  			return ide_stopped;
>  		}
> 
> -		if (ide_id_has_flush_cache_ext(drive->id)) {
> -			tf->command = WIN_FLUSH_CACHE_EXT;
> -			tf->flags |= ATA_TFLAG_LBA48;
> -		} else
> -			tf->command = WIN_FLUSH_CACHE;
> +		ide_task_init_flush(drive, args);
> 
> -		args->command_type = IDE_DRIVE_TASK_NO_DATA;
> -		args->handler	   = &task_no_data_intr;
>  		return do_rw_taskfile(drive, args);
> 
>  	case idedisk_pm_standby:	/* Suspend step 2 (standby) */
> diff -Nru a/include/linux/ide.h b/include/linux/ide.h
> --- a/include/linux/ide.h	2005-02-19 17:22:58 +01:00
> +++ b/include/linux/ide.h	2005-02-19 17:22:58 +01:00
> @@ -924,6 +924,19 @@
>  typedef ide_startstop_t (ide_handler_t)(ide_drive_t *);
>  typedef int (ide_expiry_t)(ide_drive_t *);
> 
> +typedef struct ide_task_s {
> +	struct ata_taskfile	tf;
> +	u16			data;
> +	ide_reg_valid_t		tf_out_flags;
> +	ide_reg_valid_t		tf_in_flags;
> +	int			data_phase;
> +	int			command_type;
> +	ide_pre_handler_t	*prehandler;
> +	ide_handler_t		*handler;
> +	struct request		*rq;		/* copy of request */
> +	void			*special;	/* valid_t generally */
> +} ide_task_t;
> +
>  typedef struct hwgroup_s {
>  		/* irq handler, if active */
>  	ide_startstop_t	(*handler)(ide_drive_t *);
> @@ -1189,6 +1202,8 @@
>   */
>  extern void ide_init_drive_cmd (struct request *rq);
> 
> +void ide_task_init_flush(ide_drive_t *, ide_task_t *);
> +
>  u64 ide_tf_get_address(struct ata_taskfile *);
> 
>  /*
> @@ -1250,19 +1265,6 @@
>   *  (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors, u8 *buf)
>   */
>  extern int ide_wait_cmd(ide_drive_t *, u8, u8, u8, u8, u8 *);
> -
> -typedef struct ide_task_s {
> -	struct ata_taskfile	tf;
> -	u16			data;
> -	ide_reg_valid_t		tf_out_flags;
> -	ide_reg_valid_t		tf_in_flags;
> -	int			data_phase;
> -	int			command_type;
> -	ide_pre_handler_t	*prehandler;
> -	ide_handler_t		*handler;
> -	struct request		*rq;		/* copy of request */
> -	void			*special;	/* valid_t generally */
> -} ide_task_t;
> 
>  extern u32 ide_read_24(ide_drive_t *);

-- 
tejun

Re: [patch ide-dev 4/9] add ide_task_init_flush() helper

[Bartlomiej Zolnierkiewicz]

Hi,

On Sunday 27 February 2005 05:56, Tejun Heo wrote:
>  Hello,
> 
>  Just one minor thing.  Doesn't moving ide_task_s upward belong to
> patch #7?

It is needed for ide_task_init_flush() prototype.

> > +void ide_task_init_flush(ide_drive_t *, ide_task_t *);