diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-15 09:59:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-19 16:17:32 +0200 |
| commit | 3a1e341c5687b4e8fe51ca1c933b1f23ab3304c1 (patch) | |
| tree | c5c159dc57ca9f07fb6b399c1d162ecd625ac55e /sound/drivers/pcsp/pcsp_input.c | |
| parent | ed16a22b09002fe1bef302242a0ac4a00f44b20d (diff) | |
| download | linux-3a1e341c5687b4e8fe51ca1c933b1f23ab3304c1.tar.bz2 | |
ALSA: pcsp: Allocate resources with device-managed APIs
Use the new snd_devm_card_new() for the card object allocation and the
devres version for the input device, and clean up the superfluous
remove callback.
Link: https://lore.kernel.org/r/20210715075941.23332-80-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/pcsp/pcsp_input.c')
| -rw-r--r-- | sound/drivers/pcsp/pcsp_input.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/drivers/pcsp/pcsp_input.c b/sound/drivers/pcsp/pcsp_input.c index e79603fe743d..5a799f7f00a2 100644 --- a/sound/drivers/pcsp/pcsp_input.c +++ b/sound/drivers/pcsp/pcsp_input.c @@ -78,7 +78,7 @@ int pcspkr_input_init(struct input_dev **rdev, struct device *dev) { int err; - struct input_dev *input_dev = input_allocate_device(); + struct input_dev *input_dev = devm_input_allocate_device(dev); if (!input_dev) return -ENOMEM; @@ -95,19 +95,9 @@ int pcspkr_input_init(struct input_dev **rdev, struct device *dev) input_dev->event = pcspkr_input_event; err = input_register_device(input_dev); - if (err) { - input_free_device(input_dev); + if (err) return err; - } *rdev = input_dev; return 0; } - -int pcspkr_input_remove(struct input_dev *dev) -{ - pcspkr_stop_sound(); - input_unregister_device(dev); /* this also does kfree() */ - - return 0; -} |