Re: [PATCH 5/12] ide: remove task_ioreg_t typedef

[Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>]

Bartlomiej Zolnierkiewicz wrote:

> Remove task_ioreg_t typedef from the kernel code (but leave it
> in <linux/hdreg.h> for #ifndef/#endif __KERNEL__ case).

> While at it also move sata_ioreg_t typedef under #ifndef/#endif __KERNEL__.

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>

Acked-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>

> Index: b/include/linux/hdreg.h
> ===================================================================
> --- a/include/linux/hdreg.h
> +++ b/include/linux/hdreg.h
[...]
> @@ -116,8 +116,8 @@ typedef union ide_reg_valid_s {
>  } ide_reg_valid_t;
>  
>  typedef struct ide_task_request_s {
> -	task_ioreg_t	io_ports[8];
> -	task_ioreg_t	hob_ports[8];
> +	__u8		io_ports[8];
> +	__u8		hob_ports[8];
>  	ide_reg_valid_t	out_flags;
>  	ide_reg_valid_t	in_flags;
>  	int		data_phase;
> @@ -133,32 +133,32 @@ typedef struct ide_ioctl_request_s {
>  } ide_ioctl_request_t;
>  
>  struct hd_drive_cmd_hdr {
> -	task_ioreg_t command;
> -	task_ioreg_t sector_number;
> -	task_ioreg_t feature;
> -	task_ioreg_t sector_count;
> +	__u8 command;
> +	__u8 sector_number;
> +	__u8 feature;
> +	__u8 sector_count;
>  };
>  
>  typedef struct hd_drive_task_hdr {
> -	task_ioreg_t data;
> -	task_ioreg_t feature;
> -	task_ioreg_t sector_count;
> -	task_ioreg_t sector_number;
> -	task_ioreg_t low_cylinder;
> -	task_ioreg_t high_cylinder;
> -	task_ioreg_t device_head;
> -	task_ioreg_t command;
> +	__u8 data;
> +	__u8 feature;
> +	__u8 sector_count;
> +	__u8 sector_number;
> +	__u8 low_cylinder;
> +	__u8 high_cylinder;
> +	__u8 device_head;
> +	__u8 command;
>  } task_struct_t;
>  
>  typedef struct hd_drive_hob_hdr {
> -	task_ioreg_t data;
> -	task_ioreg_t feature;
> -	task_ioreg_t sector_count;
> -	task_ioreg_t sector_number;
> -	task_ioreg_t low_cylinder;
> -	task_ioreg_t high_cylinder;
> -	task_ioreg_t device_head;
> -	task_ioreg_t control;
> +	__u8 data;
> +	__u8 feature;
> +	__u8 sector_count;
> +	__u8 sector_number;
> +	__u8 low_cylinder;
> +	__u8 high_cylinder;
> +	__u8 device_head;
> +	__u8 control;
>  } hob_struct_t;

   Why use __u8 here, and u8 elsewhere?

>  #define TASKFILE_INVALID		0x7fff
> Index: b/include/linux/ide.h
> ===================================================================
> --- a/include/linux/ide.h
> +++ b/include/linux/ide.h
> @@ -1017,7 +1017,8 @@ int ide_end_dequeued_request(ide_drive_t
>  
>  extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry);
>  
> -extern void ide_execute_command(ide_drive_t *, task_ioreg_t cmd, ide_handler_t *, unsigned int, ide_expiry_t *);
> +void ide_execute_command(ide_drive_t *, u8 cmd, ide_handler_t *,
> +			 unsigned int, ide_expiry_t *);

   Hm, why name only second parameter? :-|

MBR, Sergei
-
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