UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

sx8: remove dead IF_64BIT_DMA_IS_POSSIBLE code 

This code has effectively been commented out since the first commit,
so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-10-18 15:15:12 +02:00 committed by Jens Axboe
parent 1381262148
commit 64ab1fa5da
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/block/sx8.c
View File

@ -197,7 +197,6 @@ enum {
FL_NON_RAID = FW_VER_NON_RAID, FL_NON_RAID = FW_VER_NON_RAID,
FL_4PORT = FW_VER_4PORT, FL_4PORT = FW_VER_4PORT,
FL_FW_VER_MASK = (FW_VER_NON_RAID | FW_VER_4PORT), FL_FW_VER_MASK = (FW_VER_NON_RAID | FW_VER_4PORT),
FL_DAC = (1 << 16),
FL_DYN_MAJOR = (1 << 17), FL_DYN_MAJOR = (1 << 17),
}; };
@ -1585,7 +1584,6 @@ static int carm_init_shm(struct carm_host *host)
static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
struct carm_host *host; struct carm_host *host;
unsigned int pci_dac;
int rc; int rc;
struct request_queue *q; struct request_queue *q;
unsigned int i; unsigned int i;
@ -1600,28 +1598,12 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
if (rc) if (rc)
goto err_out; goto err_out;
#ifdef IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); if (rc) {
if (!rc) { printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); pci_name(pdev));
if (rc) { goto err_out_regions;
printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
pci_name(pdev));
goto err_out_regions;
}
pci_dac = 1;
} else {
#endif
rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
pci_name(pdev));
goto err_out_regions;
}
pci_dac = 0;
#ifdef IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */
} }
#endif
host = kzalloc(sizeof(*host), GFP_KERNEL); host = kzalloc(sizeof(*host), GFP_KERNEL);
if (!host) { if (!host) {
@ -1632,7 +1614,6 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
} }
host->pdev = pdev; host->pdev = pdev;
host->flags = pci_dac ? FL_DAC : 0;
spin_lock_init(&host->lock); spin_lock_init(&host->lock);
INIT_WORK(&host->fsm_task, carm_fsm_task); INIT_WORK(&host->fsm_task, carm_fsm_task);
init_completion(&host->probe_comp); init_completion(&host->probe_comp);