media: lmedm04: delete lme2510_get_adapter_count()

The adapter count is fixed at compile time so we can delete the
lme2510_get_adapter_count() function and set ".num_adapters = 1"
instead.  There is also no need to create a zeroed adapter
element at the end of the array.  Remove that as well.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 1b6d4e4..fe4d886 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -1122,11 +1122,6 @@ static int lme2510_powerup(struct dvb_usb_device *d, int onoff)
        return ret;
 }
 
-static int lme2510_get_adapter_count(struct dvb_usb_device *d)
-{
-       return 1;
-}
-
 static int lme2510_identify_state(struct dvb_usb_device *d, const char **name)
 {
        struct lme2510_state *st = d->priv;
@@ -1211,12 +1206,12 @@ static struct dvb_usb_device_properties lme2510_props = {
        .frontend_attach  = dm04_lme2510_frontend_attach,
        .tuner_attach = dm04_lme2510_tuner,
        .get_stream_config = lme2510_get_stream_config,
-       .get_adapter_count = lme2510_get_adapter_count,
        .streaming_ctrl   = lme2510_streaming_ctrl,
 
        .get_rc_config = lme2510_get_rc_config,
 
        .exit = lme2510_exit,
+       .num_adapters = 1,
        .adapter = {
                {
                        .caps = DVB_USB_ADAP_HAS_PID_FILTER|
@@ -1227,8 +1222,6 @@ static struct dvb_usb_device_properties lme2510_props = {
                        .stream =
                        DVB_USB_STREAM_BULK(0x86, 10, 4096),
                },
-               {
-               }
        },
 };