Merge tag 'drm-msm-next-2022-05-09' of https://gitlab.freedesktop.org/drm/msm into...

[linux-2.6-microblaze.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7f99b4d..9b1d3d8 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -519,7 +519,10 @@ struct ata_taskfile {
        u8                      hob_lbam;
        u8                      hob_lbah;
 
-       u8                      feature;
+       union {
+               u8              error;
+               u8              feature;
+       };
        u8                      nsect;
        u8                      lbal;
        u8                      lbam;
@@ -527,7 +530,10 @@ struct ata_taskfile {
 
        u8                      device;
 
-       u8                      command;        /* IO operation */
+       union {
+               u8              status;
+               u8              command;
+       };
 
        u32                     auxiliary;      /* auxiliary field */
                                                /* from SATA 3.1 and */
@@ -1081,7 +1087,7 @@ extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev,
 extern bool ata_link_online(struct ata_link *link);
 extern bool ata_link_offline(struct ata_link *link);
 #ifdef CONFIG_PM
-extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
+extern void ata_host_suspend(struct ata_host *host, pm_message_t mesg);
 extern void ata_host_resume(struct ata_host *host);
 extern void ata_sas_port_suspend(struct ata_port *ap);
 extern void ata_sas_port_resume(struct ata_port *ap);