@@ -1016,25 +1016,13 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev)
1016
1016
return group ;
1017
1017
}
1018
1018
1019
- static int fsl_pamu_add_device (struct device * dev )
1019
+ static struct iommu_device * fsl_pamu_probe_device (struct device * dev )
1020
1020
{
1021
- struct iommu_group * group ;
1022
-
1023
- group = iommu_group_get_for_dev (dev );
1024
- if (IS_ERR (group ))
1025
- return PTR_ERR (group );
1026
-
1027
- iommu_group_put (group );
1028
-
1029
- iommu_device_link (& pamu_iommu , dev );
1030
-
1031
- return 0 ;
1021
+ return & pamu_iommu ;
1032
1022
}
1033
1023
1034
- static void fsl_pamu_remove_device (struct device * dev )
1024
+ static void fsl_pamu_release_device (struct device * dev )
1035
1025
{
1036
- iommu_device_unlink (& pamu_iommu , dev );
1037
- iommu_group_remove_device (dev );
1038
1026
}
1039
1027
1040
1028
static const struct iommu_ops fsl_pamu_ops = {
@@ -1048,8 +1036,8 @@ static const struct iommu_ops fsl_pamu_ops = {
1048
1036
.iova_to_phys = fsl_pamu_iova_to_phys ,
1049
1037
.domain_set_attr = fsl_pamu_set_domain_attr ,
1050
1038
.domain_get_attr = fsl_pamu_get_domain_attr ,
1051
- .add_device = fsl_pamu_add_device ,
1052
- .remove_device = fsl_pamu_remove_device ,
1039
+ .probe_device = fsl_pamu_probe_device ,
1040
+ .release_device = fsl_pamu_release_device ,
1053
1041
.device_group = fsl_pamu_device_group ,
1054
1042
};
1055
1043
0 commit comments