Merge tag 'driver-core-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 7bcfaf5..44e3aca 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -679,10 +679,7 @@ struct device_link {
        bool supplier_preactivated; /* Owned by consumer probe. */
 };
 
-static inline struct device *kobj_to_dev(struct kobject *kobj)
-{
-       return container_of(kobj, struct device, kobj);
-}
+#define kobj_to_dev(__kobj)    container_of_const(__kobj, struct device, kobj)
 
 /**
  * device_iommu_mapped - Returns true when the device DMA is translated
@@ -1045,12 +1042,8 @@ static inline void device_remove_group(struct device *dev,
 
 int __must_check devm_device_add_groups(struct device *dev,
                                        const struct attribute_group **groups);
-void devm_device_remove_groups(struct device *dev,
-                              const struct attribute_group **groups);
 int __must_check devm_device_add_group(struct device *dev,
                                       const struct attribute_group *grp);
-void devm_device_remove_group(struct device *dev,
-                             const struct attribute_group *grp);
 
 /*
  * Platform "fixup" functions - allow the platform to have their say