projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/rockchip: add rk3399 vop big csc support
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
sata_sil.c
diff --git
a/drivers/ata/sata_sil.c
b/drivers/ata/sata_sil.c
index 0ae3ca4bf5c0a063077885f18e7375826a696c24..29bcff086bcedd548f90a15fd67829c7b21a4de9 100644
(file)
--- a/
drivers/ata/sata_sil.c
+++ b/
drivers/ata/sata_sil.c
@@
-37,7
+37,6
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
@@
-113,7
+112,7
@@
enum {
};
static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
};
static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int sil_pci_device_resume(struct pci_dev *pdev);
#endif
static void sil_dev_config(struct ata_device *dev);
static int sil_pci_device_resume(struct pci_dev *pdev);
#endif
static void sil_dev_config(struct ata_device *dev);
@@
-157,6
+156,7
@@
static const struct sil_drivelist {
{ "ST380011ASL", SIL_QUIRK_MOD15WRITE },
{ "ST3120022ASL", SIL_QUIRK_MOD15WRITE },
{ "ST3160021ASL", SIL_QUIRK_MOD15WRITE },
{ "ST380011ASL", SIL_QUIRK_MOD15WRITE },
{ "ST3120022ASL", SIL_QUIRK_MOD15WRITE },
{ "ST3160021ASL", SIL_QUIRK_MOD15WRITE },
+ { "TOSHIBA MK2561GSYN", SIL_QUIRK_MOD15WRITE },
{ "Maxtor 4D060H3", SIL_QUIRK_UDMA5MAX },
{ }
};
{ "Maxtor 4D060H3", SIL_QUIRK_UDMA5MAX },
{ }
};
@@
-166,7
+166,7
@@
static struct pci_driver sil_pci_driver = {
.id_table = sil_pci_tbl,
.probe = sil_init_one,
.remove = ata_pci_remove_one,
.id_table = sil_pci_tbl,
.probe = sil_init_one,
.remove = ata_pci_remove_one,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
.suspend = ata_pci_device_suspend,
.resume = sil_pci_device_resume,
#endif
.suspend = ata_pci_device_suspend,
.resume = sil_pci_device_resume,
#endif
@@
-630,6
+630,9
@@
static void sil_dev_config(struct ata_device *dev)
unsigned int n, quirks = 0;
unsigned char model_num[ATA_ID_PROD_LEN + 1];
unsigned int n, quirks = 0;
unsigned char model_num[ATA_ID_PROD_LEN + 1];
+ /* This controller doesn't support trim */
+ dev->horkage |= ATA_HORKAGE_NOTRIM;
+
ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
for (n = 0; sil_blacklist[n].product; n++)
ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
for (n = 0; sil_blacklist[n].product; n++)
@@
-770,10
+773,10
@@
static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return rc;
host->iomap = pcim_iomap_table(pdev);
return rc;
host->iomap = pcim_iomap_table(pdev);
- rc =
pci_set_dma_mask(p
dev, ATA_DMA_MASK);
+ rc =
dma_set_mask(&pdev->
dev, ATA_DMA_MASK);
if (rc)
return rc;
if (rc)
return rc;
- rc =
pci_set_consistent_dma_mask(p
dev, ATA_DMA_MASK);
+ rc =
dma_set_coherent_mask(&pdev->
dev, ATA_DMA_MASK);
if (rc)
return rc;
if (rc)
return rc;
@@
-802,10
+805,10
@@
static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
&sil_sht);
}
&sil_sht);
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int sil_pci_device_resume(struct pci_dev *pdev)
{
static int sil_pci_device_resume(struct pci_dev *pdev)
{
- struct ata_host *host =
dev_get_drvdata(&pdev->
dev);
+ struct ata_host *host =
pci_get_drvdata(p
dev);
int rc;
rc = ata_pci_device_do_resume(pdev);
int rc;
rc = ata_pci_device_do_resume(pdev);