PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

[cascardo/linux.git] / drivers / scsi / ufs / ufshcd-pci.c

diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c
index 8b95312..afaabe2 100644 (file)
--- a/drivers/scsi/ufs/ufshcd-pci.c
+++ b/drivers/scsi/ufs/ufshcd-pci.c
@@ -134,26 +134,6 @@ static void ufshcd_pci_remove(struct pci_dev *pdev)
        ufshcd_remove(hba);
 }
 
-/**
- * ufshcd_set_dma_mask - Set dma mask based on the controller
- *                      addressing capability
- * @pdev: PCI device structure
- *
- * Returns 0 for success, non-zero for failure
- */
-static int ufshcd_set_dma_mask(struct pci_dev *pdev)
-{
-       int err;
-
-       if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))
-               && !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))
-               return 0;
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
-       return err;
-}
-
 /**
  * ufshcd_pci_probe - probe routine of the driver
  * @pdev: pointer to PCI device handle
@@ -184,12 +164,6 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        mmio_base = pcim_iomap_table(pdev)[0];
 
-       err = ufshcd_set_dma_mask(pdev);
-       if (err) {
-               dev_err(&pdev->dev, "set dma mask failed\n");
-               return err;
-       }
-
        err = ufshcd_init(&pdev->dev, &hba, mmio_base, pdev->irq);
        if (err) {
                dev_err(&pdev->dev, "Initialization failed\n");
@@ -211,7 +185,7 @@ static const struct dev_pm_ops ufshcd_pci_pm_ops = {
        .runtime_idle    = ufshcd_pci_runtime_idle,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(ufshcd_pci_tbl) = {
+static const struct pci_device_id ufshcd_pci_tbl[] = {
        { PCI_VENDOR_ID_SAMSUNG, 0xC00C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { }     /* terminate list */
 };