ALSA: ppc: remove redundant checks in PS3 driver probe
authorLeonard Goehrs <l.goehrs@pengutronix.de>
Fri, 27 Nov 2020 15:22:59 +0000 (16:22 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 28 Nov 2020 08:49:19 +0000 (09:49 +0100)
The check for the FW_FEATURE_PS3_LV1 firmware feature is already performed
in ps3_system_bus_init() before registering the driver. So if the probe
function is actually used, this feature is already known to be available.

The check for the match id is also superfluous; the condition is always
true because the bus' match function (ps3_system_bus_match()) only
considers this driver for devices having:
dev->match_id == snd_ps3_bus_driver_info.match_id.

Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Leonard Goehrs <l.goehrs@pengutronix.de>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: Geoff Levand <geoff@infradead.org>
Link: https://lore.kernel.org/r/20201127152259.1470079-1-l.goehrs@pengutronix.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/ppc/snd_ps3.c

index 6ab796a5d9363fe631a7b62fce4e2c4b8796c759..966b709ee28631cf56e64d6ed83307fed7ab1328 100644 (file)
@@ -896,11 +896,6 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
        u64 lpar_addr, lpar_size;
        static u64 dummy_mask;
 
-       if (WARN_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1)))
-               return -ENODEV;
-       if (WARN_ON(dev->match_id != PS3_MATCH_ID_SOUND))
-               return -ENODEV;
-
        the_card.ps3_dev = dev;
 
        ret = ps3_open_hv_device(dev);