|
@@ -37,7 +37,6 @@ struct ipmmu_vmsa_device {
|
|
struct device *dev;
|
|
struct device *dev;
|
|
void __iomem *base;
|
|
void __iomem *base;
|
|
struct iommu_device iommu;
|
|
struct iommu_device iommu;
|
|
- struct list_head list;
|
|
|
|
|
|
|
|
unsigned int num_utlbs;
|
|
unsigned int num_utlbs;
|
|
spinlock_t lock; /* Protects ctx and domains[] */
|
|
spinlock_t lock; /* Protects ctx and domains[] */
|
|
@@ -64,9 +63,6 @@ struct ipmmu_vmsa_iommu_priv {
|
|
struct list_head list;
|
|
struct list_head list;
|
|
};
|
|
};
|
|
|
|
|
|
-static DEFINE_SPINLOCK(ipmmu_devices_lock);
|
|
|
|
-static LIST_HEAD(ipmmu_devices);
|
|
|
|
-
|
|
|
|
static struct ipmmu_vmsa_domain *to_vmsa_domain(struct iommu_domain *dom)
|
|
static struct ipmmu_vmsa_domain *to_vmsa_domain(struct iommu_domain *dom)
|
|
{
|
|
{
|
|
return container_of(dom, struct ipmmu_vmsa_domain, io_domain);
|
|
return container_of(dom, struct ipmmu_vmsa_domain, io_domain);
|
|
@@ -970,10 +966,6 @@ static int ipmmu_probe(struct platform_device *pdev)
|
|
* ipmmu_init() after the probe function returns.
|
|
* ipmmu_init() after the probe function returns.
|
|
*/
|
|
*/
|
|
|
|
|
|
- spin_lock(&ipmmu_devices_lock);
|
|
|
|
- list_add(&mmu->list, &ipmmu_devices);
|
|
|
|
- spin_unlock(&ipmmu_devices_lock);
|
|
|
|
-
|
|
|
|
platform_set_drvdata(pdev, mmu);
|
|
platform_set_drvdata(pdev, mmu);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -983,10 +975,6 @@ static int ipmmu_remove(struct platform_device *pdev)
|
|
{
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = platform_get_drvdata(pdev);
|
|
struct ipmmu_vmsa_device *mmu = platform_get_drvdata(pdev);
|
|
|
|
|
|
- spin_lock(&ipmmu_devices_lock);
|
|
|
|
- list_del(&mmu->list);
|
|
|
|
- spin_unlock(&ipmmu_devices_lock);
|
|
|
|
-
|
|
|
|
iommu_device_unregister(&mmu->iommu);
|
|
iommu_device_unregister(&mmu->iommu);
|
|
|
|
|
|
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
|
|
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
|