33 files changed, 74 insertions, 55 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index e45f83789809..49f1e6890587 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -321,6 +321,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
        { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */
        { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */
        { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */
+        { PCI_VDEVICE(INTEL, 0x9d03), board_ahci }, /* Sunrise Point-LP AHCI */
+        { PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */
+        { PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */
        { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */
        { PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H RAID */
        { PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */
@@ -492,6 +495,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         * enabled.  https://bugzilla.kernel.org/show_bug.cgi?id=60731
         */
        { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi },
+        { PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_nomsi },
        /* Enmotus */
        { PCI_DEVICE(0x1c44, 0x8000), board_ahci },
diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index ad1e71ec10cf..ce8a7a6d6c7f 100644
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -103,7 +103,6 @@ static struct platform_driver ahci_da850_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "ahci_da850",
-                .owner = THIS_MODULE,
                .pm = &ahci_da850_pm_ops,
        },
 };
diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c
index f3970b4ed889..35d51c59a370 100644
--- a/drivers/ata/ahci_imx.c
+++ b/drivers/ata/ahci_imx.c
@@ -679,7 +679,6 @@ static struct platform_driver imx_ahci_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "ahci-imx",
-                .owner = THIS_MODULE,
                .of_match_table = imx_ahci_of_match,
                .pm = &ahci_imx_pm_ops,
        },
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 68672d2692ee..64bb08432b69 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -115,7 +115,6 @@ static struct platform_driver ahci_mvebu_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "ahci-mvebu",
-                .owner = THIS_MODULE,
                .of_match_table = ahci_mvebu_of_match,
        },
 };
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 06f1d59fa678..18d539837045 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -76,7 +76,6 @@ static struct platform_driver ahci_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "ahci",
-                .owner = THIS_MODULE,
                .of_match_table = ahci_of_match,
                .pm = &ahci_pm_ops,
        },
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 835d6eea84fd..2f9e8317cc16 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -230,7 +230,6 @@ MODULE_DEVICE_TABLE(of, st_ahci_match);
 static struct platform_driver st_ahci_driver = {
        .driver = {
                .name = "st_ahci",
-                .owner = THIS_MODULE,
                .pm = &st_ahci_pm_ops,
                .of_match_table = of_match_ptr(st_ahci_match),
        },
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index e44d675a30ec..e2e0da539a2f 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -27,6 +27,12 @@
 #include <linux/regulator/consumer.h>
 #include "ahci.h"
+/* Insmod parameters */
+static bool enable_pmp;
+module_param(enable_pmp, bool, 0);
+MODULE_PARM_DESC(enable_pmp,
+        "Enable support for sata port multipliers, only use if you use a pmp!");
 #define AHCI_BISTAFR    0x00a0
 #define AHCI_BISTCR     0x00a4
 #define AHCI_BISTFCTR   0x00a8
@@ -184,7 +190,15 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
                goto disable_resources;
        hpriv->flags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
-                       AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
+                       AHCI_HFLAG_YES_NCQ;
+        /*
+         * The sunxi sata controller seems to be unable to successfully do a
+         * soft reset if no pmp is attached, so disable pmp use unless
+         * requested, otherwise directly attached disks do not work.
+         */
+        if (!enable_pmp)
+                hpriv->flags |= AHCI_HFLAG_NO_PMP;
        rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info);
        if (rc)
@@ -238,7 +252,6 @@ static struct platform_driver ahci_sunxi_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "ahci-sunxi",
-                .owner = THIS_MODULE,
                .of_match_table = ahci_sunxi_of_match,
                .pm = &ahci_sunxi_pm_ops,
        },
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index 0f8538f238b6..feeb8f1e2fe8 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -544,7 +544,6 @@ static struct platform_driver xgene_ahci_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "xgene-ahci",
-                .owner = THIS_MODULE,
                .of_match_table = xgene_ahci_of_match,
        },
 };
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c5ba15af87d3..5c84fb5c3372 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1043,8 +1043,8 @@ const char *sata_spd_string(unsigned int spd)
 *      None.
 *
 *      RETURNS:
- *      Device type, %ATA_DEV_ATA, %ATA_DEV_ATAPI, %ATA_DEV_PMP or
+ *      Device type, %ATA_DEV_ATA, %ATA_DEV_ATAPI, %ATA_DEV_PMP,
- *      %ATA_DEV_UNKNOWN the event of failure.
+ *      %ATA_DEV_ZAC, or %ATA_DEV_UNKNOWN the event of failure.
 */
 unsigned int ata_dev_classify(const struct ata_taskfile *tf)
 {
@@ -1089,6 +1089,11 @@ unsigned int ata_dev_classify(const struct ata_taskfile *tf)
                return ATA_DEV_SEMB;
        }
+        if ((tf->lbam == 0xcd) && (tf->lbah == 0xab)) {
+                DPRINTK("found ZAC device by sig\n");
+                return ATA_DEV_ZAC;
+        }
        DPRINTK("unknown device\n");
        return ATA_DEV_UNKNOWN;
 }
@@ -1329,7 +1334,7 @@ static int ata_hpa_resize(struct ata_device *dev)
        int rc;
        /* do we need to do it? */
-        if (dev->class != ATA_DEV_ATA ||
+        if ((dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC) ||
            !ata_id_has_lba(dev->id) || !ata_id_hpa_enabled(dev->id) ||
            (dev->horkage & ATA_HORKAGE_BROKEN_HPA))
                return 0;
@@ -1889,6 +1894,7 @@ retry:
        case ATA_DEV_SEMB:
                class = ATA_DEV_ATA;    /* some hard drives report SEMB sig */
        case ATA_DEV_ATA:
+        case ATA_DEV_ZAC:
                tf.command = ATA_CMD_ID_ATA;
                break;
        case ATA_DEV_ATAPI:
@@ -1980,7 +1986,7 @@ retry:
        rc = -EINVAL;
        reason = "device reports invalid type";
-        if (class == ATA_DEV_ATA) {
+        if (class == ATA_DEV_ATA || class == ATA_DEV_ZAC) {
                if (!ata_id_is_ata(id) && !ata_id_is_cfa(id))
                        goto err_out;
                if (ap->host->flags & ATA_HOST_IGNORE_ATA &&
@@ -2015,7 +2021,8 @@ retry:
                        goto retry;
        }
-        if ((flags & ATA_READID_POSTRESET) && class == ATA_DEV_ATA) {
+        if ((flags & ATA_READID_POSTRESET) &&
+            (class == ATA_DEV_ATA || class == ATA_DEV_ZAC)) {
                /*
                 * The exact sequence expected by certain pre-ATA4 drives is:
                 * SRST RESET
@@ -2280,7 +2287,7 @@ int ata_dev_configure(struct ata_device *dev)
                        sizeof(modelbuf));
        /* ATA-specific feature tests */
-        if (dev->class == ATA_DEV_ATA) {
+        if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {
                if (ata_id_is_cfa(id)) {
                        /* CPRM may make this media unusable */
                        if (id[ATA_ID_CFA_KEY_MGMT] & 1)
@@ -4033,6 +4040,7 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
        if (ata_class_enabled(new_class) &&
            new_class != ATA_DEV_ATA &&
            new_class != ATA_DEV_ATAPI &&
+            new_class != ATA_DEV_ZAC &&
            new_class != ATA_DEV_SEMB) {
                ata_dev_info(dev, "class mismatch %u != %u\n",
                             dev->class, new_class);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index dad83df555c4..3dbec8954c86 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1809,6 +1809,7 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
        switch (qc->dev->class) {
        case ATA_DEV_ATA:
+        case ATA_DEV_ZAC:
                if (err & ATA_ICRC)
                        qc->err_mask |= AC_ERR_ATA_BUS;
                if (err & (ATA_UNC | ATA_AMNF))
@@ -3792,7 +3793,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                                struct ata_eh_context *ehc = &link->eh_context;
                                unsigned long tmp;
-                                if (dev->class != ATA_DEV_ATA)
+                                if (dev->class != ATA_DEV_ATA &&
+                                    dev->class != ATA_DEV_ZAC)
                                        continue;
                                if (!(ehc->i.dev_action[dev->devno] &
                                      ATA_EH_PARK))
@@ -3873,7 +3875,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                /* retry flush if necessary */
                ata_for_each_dev(dev, link, ALL) {
-                        if (dev->class != ATA_DEV_ATA)
+                        if (dev->class != ATA_DEV_ATA &&
+                            dev->class != ATA_DEV_ZAC)
                                continue;
                        rc = ata_eh_maybe_retry_flush(dev);
                        if (rc)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 0586f66d70fa..e364e86e84d7 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -235,7 +235,8 @@ static ssize_t ata_scsi_park_store(struct device *device,
                rc = -ENODEV;
                goto unlock;
        }
-        if (dev->class != ATA_DEV_ATA) {
+        if (dev->class != ATA_DEV_ATA &&
+            dev->class != ATA_DEV_ZAC) {
                rc = -EOPNOTSUPP;
                goto unlock;
        }
@@ -1164,7 +1165,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
                depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
                depth = min(ATA_MAX_QUEUE - 1, depth);
-                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
+                scsi_change_queue_depth(sdev, depth);
        }
        blk_queue_flush_queueable(q, false);
@@ -1243,21 +1244,17 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev)
 *      @ap: ATA port to which the device change the queue depth
 *      @sdev: SCSI device to configure queue depth for
 *      @queue_depth: new queue depth
- *      @reason: calling context
 *
 *      libsas and libata have different approaches for associating a sdev to
 *      its ata_port.
 *
 */
 int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
-                             int queue_depth, int reason)
+                             int queue_depth)
 {
        struct ata_device *dev;
        unsigned long flags;
-        if (reason != SCSI_QDEPTH_DEFAULT)
-                return -EOPNOTSUPP;
        if (queue_depth < 1 || queue_depth == sdev->queue_depth)
                return sdev->queue_depth;
@@ -1282,15 +1279,13 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
        if (sdev->queue_depth == queue_depth)
                return -EINVAL;
-        scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth);
+        return scsi_change_queue_depth(sdev, queue_depth);
-        return queue_depth;
 }
 /**
 *      ata_scsi_change_queue_depth - SCSI callback for queue depth config
 *      @sdev: SCSI device to configure queue depth for
 *      @queue_depth: new queue depth
- *      @reason: calling context
 *
 *      This is libata standard hostt->change_queue_depth callback.
 *      SCSI will call into this callback when user tries to set queue
@@ -1302,12 +1297,11 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
 *      RETURNS:
 *      Newly configured queue depth.
 */
-int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth,
+int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
-                                int reason)
 {
        struct ata_port *ap = ata_shost_to_port(sdev->host);
-        return __ata_change_queue_depth(ap, sdev, queue_depth, reason);
+        return __ata_change_queue_depth(ap, sdev, queue_depth);
 }
 /**
@@ -1968,6 +1962,7 @@ static void ata_scsi_rbuf_fill(struct ata_scsi_args *args,
 static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
 {
        const u8 versions[] = {
+                0x00,
                0x60,   /* SAM-3 (no version claimed) */
                0x03,
@@ -1976,6 +1971,20 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
                0x02,
                0x60    /* SPC-3 (no version claimed) */
        };
+        const u8 versions_zbc[] = {
+                0x00,
+                0xA0,   /* SAM-5 (no version claimed) */
+                0x04,
+                0xC0,   /* SBC-3 (no version claimed) */
+                0x04,
+                0x60,   /* SPC-4 (no version claimed) */
+                0x60,
+                0x20,   /* ZBC (no version claimed) */
+        };
        u8 hdr[] = {
                TYPE_DISK,
                0,
@@ -1990,6 +1999,11 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
        if (ata_id_removeable(args->id))
                hdr[1] |= (1 << 7);
+        if (args->dev->class == ATA_DEV_ZAC) {
+                hdr[0] = TYPE_ZBC;
+                hdr[2] = 0x6; /* ZBC is defined in SPC-4 */
+        }
        memcpy(rbuf, hdr, sizeof(hdr));
        memcpy(&rbuf[8], "ATA     ", 8);
        ata_id_string(args->id, &rbuf[16], ATA_ID_PROD, 16);
@@ -2002,7 +2016,10 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
        if (rbuf[32] == 0 || rbuf[32] == ' ')
                memcpy(&rbuf[32], "n/a ", 4);
-        memcpy(rbuf + 59, versions, sizeof(versions));
+        if (args->dev->class == ATA_DEV_ZAC)
+                memcpy(rbuf + 58, versions_zbc, sizeof(versions_zbc));
+        else
+                memcpy(rbuf + 58, versions, sizeof(versions));
        return 0;
 }
@@ -2571,7 +2588,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
        DPRINTK("ATAPI request sense\n");
-        /* FIXME: is this needed? */
        memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
 #ifdef CONFIG_ATA_SFF
@@ -3412,7 +3428,7 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
        ata_xlat_func_t xlat_func;
        int rc = 0;
-        if (dev->class == ATA_DEV_ATA) {
+        if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {
                if (unlikely(!scmd->cmd_len || scmd->cmd_len > dev->cdb_len))
                        goto bad_cdb_len;
@@ -3570,7 +3586,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)
                ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);
                break;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16)
                        ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);
                else
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index e37413228228..3227b7c8a05f 100644
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -143,6 +143,7 @@ static struct {
        { ATA_DEV_PMP_UNSUP,            "pmp" },
        { ATA_DEV_SEMB,                 "semb" },
        { ATA_DEV_SEMB_UNSUP,           "semb" },
+        { ATA_DEV_ZAC,                  "zac" },
        { ATA_DEV_NONE,                 "none" }
 };
 ata_bitfield_name_search(class, ata_class_names)
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 38216b991474..a9b0c820f2eb 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -961,7 +961,6 @@ static struct platform_driver arasan_cf_driver = {
        .remove         = arasan_cf_remove,
        .driver         = {
                .name   = DRIVER_NAME,
-                .owner  = THIS_MODULE,
                .pm     = &arasan_cf_pm_ops,
                .of_match_table = of_match_ptr(arasan_cf_id_table),
        },
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index d59d5239405f..9aeb7a6dd4d4 100644
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -389,7 +389,6 @@ static struct platform_driver pata_at32_driver = {
        .remove        = __exit_p(pata_at32_remove),
        .driver        = {
                .name  = "at32_ide",
-                .owner = THIS_MODULE,
        },
 };
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index 8a66f23af4c4..9e85937d36a9 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -444,7 +444,6 @@ static struct platform_driver pata_at91_driver = {
        .remove         = pata_at91_remove,
        .driver         = {
                .name           = DRV_NAME,
-                .owner          = THIS_MODULE,
        },
 };
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 03f2f2bc83bd..dd7410019d15 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1657,7 +1657,6 @@ static struct platform_driver bfin_atapi_driver = {
        .resume                 = bfin_atapi_resume,
        .driver = {
                .name           = DRV_NAME,
-                .owner          = THIS_MODULE,
        },
 };
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 4d37c5415fc7..bd6b089c67a3 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -1021,7 +1021,6 @@ static int ep93xx_pata_remove(struct platform_device *pdev)
 static struct platform_driver ep93xx_pata_platform_driver = {
        .driver = {
                .name = DRV_NAME,
-                .owner = THIS_MODULE,
        },
        .probe = ep93xx_pata_probe,
        .remove = ep93xx_pata_remove,
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index 989ff5ac69ec..139d20778b29 100644
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
@@ -240,7 +240,6 @@ static struct platform_driver pata_imx_driver = {
        .driver = {
                .name           = DRV_NAME,
                .of_match_table = imx_pata_dt_ids,
-                .owner          = THIS_MODULE,
                .pm             = &pata_imx_pm_ops,
        },
 };
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index ddf470c2341d..abda44183512 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -193,7 +193,6 @@ static int ixp4xx_pata_probe(struct platform_device *pdev)
 static struct platform_driver ixp4xx_pata_platform_driver = {
        .driver  = {
                .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
        },
        .probe          = ixp4xx_pata_probe,
        .remove         = ata_platform_remove_one,
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index ccd1c83a05cc..252ba27fa63b 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -863,7 +863,6 @@ static struct platform_driver mpc52xx_ata_of_platform_driver = {
 #endif
        .driver         = {
                .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
                .of_match_table = mpc52xx_ata_of_match,
        },
 };
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index 2a97d3a531ec..80a80548ad0a 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -1059,7 +1059,6 @@ static struct platform_driver octeon_cf_driver = {
        .probe          = octeon_cf_probe,
        .driver         = {
                .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
                .of_match_table = octeon_cf_match,
                .shutdown = octeon_cf_shutdown
        },
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 64965398914a..dcc408abe171 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -75,7 +75,6 @@ MODULE_DEVICE_TABLE(of, pata_of_platform_match);
 static struct platform_driver pata_of_platform_driver = {
        .driver = {
                .name = "pata_of_platform",
-                .owner = THIS_MODULE,
                .of_match_table = pata_of_platform_match,
        },
        .probe          = pata_of_platform_probe,
diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
index df2bb7504fc8..8c0d7d736b7a 100644
--- a/drivers/ata/pata_palmld.c
+++ b/drivers/ata/pata_palmld.c
@@ -124,7 +124,6 @@ static int palmld_pata_remove(struct platform_device *dev)
 static struct platform_driver palmld_pata_platform_driver = {
        .driver  = {
                .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
        },
        .probe          = palmld_pata_probe,
        .remove         = palmld_pata_remove,
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index f8cff3e247c5..1eedfe46d7c8 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -224,7 +224,6 @@ static struct platform_driver pata_platform_driver = {
        .remove         = ata_platform_remove_one,
        .driver = {
                .name           = DRV_NAME,
-                .owner          = THIS_MODULE,
        },
 };
diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index 73259bfda1e3..c36b3e6531d8 100644
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -385,7 +385,6 @@ static struct platform_driver pxa_ata_driver = {
        .remove         = pxa_ata_remove,
        .driver         = {
                .name           = DRV_NAME,
-                .owner          = THIS_MODULE,
        },
 };
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index 3c5eb8fa6bd1..6d08446b877c 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -193,7 +193,6 @@ static struct platform_driver rb532_pata_platform_driver = {
        .remove         = rb532_pata_driver_remove,
        .driver  = {
                .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index 1a24a5dc3940..fa44eb2872db 100644
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -656,7 +656,6 @@ static struct platform_driver pata_s3c_driver = {
        .id_table       = pata_s3c_driver_ids,
        .driver         = {
                .name   = DRV_NAME,
-                .owner  = THIS_MODULE,
 #ifdef CONFIG_PM_SLEEP
                .pm     = &pata_s3c_pm_ops,
 #endif
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 0bb2cabd2197..c7ddef89e7b0 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1807,7 +1807,6 @@ MODULE_DEVICE_TABLE(of, sata_dwc_match);
 static struct platform_driver sata_dwc_driver = {
        .driver = {
                .name = DRV_NAME,
-                .owner = THIS_MODULE,
                .of_match_table = sata_dwc_match,
        },
        .probe = sata_dwc_probe,
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 07bc7e4dbd04..f9054cd36a72 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1488,7 +1488,7 @@ static int sata_fsl_probe(struct platform_device *ofdev)
        host_priv->csr_base = csr_base;
        irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
-        if (irq < 0) {
+        if (!irq) {
                dev_err(&ofdev->dev, "invalid irq from platform\n");
                goto error_exit_with_cleanup;
        }
@@ -1624,7 +1624,6 @@ MODULE_DEVICE_TABLE(of, fsl_sata_match);
 static struct platform_driver fsl_sata_driver = {
        .driver = {
                .name = "fsl-sata",
-                .owner = THIS_MODULE,
                .of_match_table = fsl_sata_match,
        },
        .probe          = sata_fsl_probe,
diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index ce2b99a1ed70..24e311fe2c1c 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -634,7 +634,6 @@ static struct platform_driver ahci_highbank_driver = {
        .remove = ata_platform_remove_one,
        .driver = {
                .name = "highbank-ahci",
-                .owner = THIS_MODULE,
                .of_match_table = ahci_of_match,
                .pm = &ahci_highbank_pm_ops,
        },
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 391cfda1e83f..f9a0e34eb111 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4280,7 +4280,6 @@ static struct platform_driver mv_platform_driver = {
        .resume         = mv_platform_resume,
        .driver         = {
                .name = DRV_NAME,
-                .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(mv_sata_dt_ids),
        },
 };
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index cdf99fac139a..1db6f5ce5e89 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1951,7 +1951,7 @@ static int nv_swncq_slave_config(struct scsi_device *sdev)
        ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
        if (strncmp(model_num, "Maxtor", 6) == 0) {
-                ata_scsi_change_queue_depth(sdev, 1, SCSI_QDEPTH_DEFAULT);
+                ata_scsi_change_queue_depth(sdev, 1);
                ata_dev_notice(dev, "Disabling SWNCQ mode (depth %x)\n",
                               sdev->queue_depth);
        }
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index ea1fbc1d4c5f..cb0d2e644af5 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -1004,7 +1004,6 @@ static struct platform_driver sata_rcar_driver = {
        .id_table       = sata_rcar_id_table,
        .driver = {
                .name           = DRV_NAME,
-                .owner          = THIS_MODULE,
                .of_match_table = sata_rcar_match,
 #ifdef CONFIG_PM_SLEEP
                .pm             = &sata_rcar_pm_ops,