Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a91dfbac authored by Tony Truong's avatar Tony Truong
Browse files

msm: pcie: remove PCI_MSM_MSI dependencies 



PCI_MSM_MSI is no longer its own config option. It is bounded
with PCI_MSM so remove any dependencies for it.

Change-Id: Ic417b5e063c268f1bda73e28ffe790c4da4698e8
Signed-off-by: default avatarTony Truong <truong@codeaurora.org>
parent ef3efce5

drivers/pci/controller/pci-msm.c

+3 −5
Original line number Diff line number Diff line
@@ -4610,11 +4610,9 @@ int msm_pcie_enumerate(u32 rc_idx) 
		goto out;

	}



	if (IS_ENABLED(CONFIG_PCI_MSM_MSI)) {

	ret = msm_msi_init(&dev->pdev->dev);

	if (ret)

		goto out;

	}



	list_splice_init(&res, &bridge->windows);

	bridge->dev.parent = &dev->pdev->dev;

include/linux/msm_pcie.h

+1 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.*/

/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.*/



#ifndef __MSM_PCIE_H

#define __MSM_PCIE_H
@@ -54,14 +54,7 @@ struct msm_pcie_register_event { 
	u32 options;

};



#if IS_ENABLED(CONFIG_PCI_MSM_MSI)

int msm_msi_init(struct device *dev);

#else

static inline int msm_msi_init(struct device *dev)

{

	return -EINVAL;

}

#endif



#if IS_ENABLED(CONFIG_PCI_MSM)