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 <ge...@linux-m68k.org>
Signed-off-by: Leonard Goehrs <l.goe...@pengutronix.de>
---
 sound/ppc/snd_ps3.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 58bb49fff184..b6e4aa3df870 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -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);
-- 
2.20.1

Reply via email to