diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-12-31 12:44:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-12-31 12:44:41 +0100 |
| commit | 41d11d6e1aa167ae8c4849905b338b60db98be44 (patch) | |
| tree | aa88e11182b051741bc4d69859d39de6a2f51a69 /include/linux/platform_device.h | |
| parent | 1b2ff639ff0cb999285d90c57d3f856b91c2aea6 (diff) | |
| parent | 7b509910b3ad6d7aacead24c8744de10daf8715d (diff) | |
Merge branch 'for-linus' into for-next
Pull 6.13 devel branch for further development of sequencer stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 7132623e4658..074754c23d33 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -235,17 +235,7 @@ extern void platform_device_put(struct platform_device *pdev); struct platform_driver { int (*probe)(struct platform_device *); - - /* - * .remove_new() is a relic from a prototype conversion of .remove(). - * New drivers are supposed to implement .remove(). Once all drivers are - * converted to not use .remove_new any more, it will be dropped. - */ - union { - void (*remove)(struct platform_device *); - void (*remove_new)(struct platform_device *); - }; - + void (*remove)(struct platform_device *); void (*shutdown)(struct platform_device *); int (*suspend)(struct platform_device *, pm_message_t state); int (*resume)(struct platform_device *); |