NVMe: Cache dev->pci_dev in a local pointer
Helps with line-length issues Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Родитель
0a8d44cb33
Коммит
68608c268b
|
@ -1891,6 +1891,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
|
||||||
*/
|
*/
|
||||||
static int nvme_dev_add(struct nvme_dev *dev)
|
static int nvme_dev_add(struct nvme_dev *dev)
|
||||||
{
|
{
|
||||||
|
struct pci_dev *pdev = dev->pci_dev;
|
||||||
int res;
|
int res;
|
||||||
unsigned nn, i;
|
unsigned nn, i;
|
||||||
struct nvme_ns *ns;
|
struct nvme_ns *ns;
|
||||||
|
@ -1900,8 +1901,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
|
||||||
dma_addr_t dma_addr;
|
dma_addr_t dma_addr;
|
||||||
int shift = NVME_CAP_MPSMIN(readq(&dev->bar->cap)) + 12;
|
int shift = NVME_CAP_MPSMIN(readq(&dev->bar->cap)) + 12;
|
||||||
|
|
||||||
mem = dma_alloc_coherent(&dev->pci_dev->dev, 8192, &dma_addr,
|
mem = dma_alloc_coherent(&pdev->dev, 8192, &dma_addr, GFP_KERNEL);
|
||||||
GFP_KERNEL);
|
|
||||||
if (!mem)
|
if (!mem)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -1919,8 +1919,8 @@ static int nvme_dev_add(struct nvme_dev *dev)
|
||||||
memcpy(dev->firmware_rev, ctrl->fr, sizeof(ctrl->fr));
|
memcpy(dev->firmware_rev, ctrl->fr, sizeof(ctrl->fr));
|
||||||
if (ctrl->mdts)
|
if (ctrl->mdts)
|
||||||
dev->max_hw_sectors = 1 << (ctrl->mdts + shift - 9);
|
dev->max_hw_sectors = 1 << (ctrl->mdts + shift - 9);
|
||||||
if ((dev->pci_dev->vendor == PCI_VENDOR_ID_INTEL) &&
|
if ((pdev->vendor == PCI_VENDOR_ID_INTEL) &&
|
||||||
(dev->pci_dev->device == 0x0953) && ctrl->vs[3])
|
(pdev->device == 0x0953) && ctrl->vs[3])
|
||||||
dev->stripe_size = 1 << (ctrl->vs[3] + shift);
|
dev->stripe_size = 1 << (ctrl->vs[3] + shift);
|
||||||
|
|
||||||
id_ns = mem;
|
id_ns = mem;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче