]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5448): M920x: rename megasky_identify_state to m920x_identify_state
authorAapo Tahkola <aet@rasterburn.org>
Thu, 15 Mar 2007 16:01:46 +0000 (13:01 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 27 Apr 2007 18:44:53 +0000 (15:44 -0300)
This function should work for all m920x-based devices.

Signed-off-by: Aapo Tahkola <aet@rasterburn.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/dvb-usb/m920x.c

index 8c954814f827338cb4c47a6bf638930048b588db..485ea5ca5aeb8520e65807b189192fc306221f68 100644 (file)
@@ -341,10 +341,10 @@ static int m9206_firmware_download(struct usb_device *udev,
 }
 
 /* Callbacks for DVB USB */
-static int megasky_identify_state(struct usb_device *udev,
-                                 struct dvb_usb_device_properties *props,
-                                 struct dvb_usb_device_description **desc,
-                                 int *cold)
+static int m920x_identify_state(struct usb_device *udev,
+                               struct dvb_usb_device_properties *props,
+                               struct dvb_usb_device_description **desc,
+                               int *cold)
 {
        struct usb_host_interface *alt;
 
@@ -463,7 +463,7 @@ static struct dvb_usb_device_properties megasky_properties = {
 
        .size_of_priv     = sizeof(struct m9206_state),
 
-       .identify_state   = megasky_identify_state,
+       .identify_state   = m920x_identify_state,
        .num_adapters = 1,
        .adapter = {{
                .caps = DVB_USB_ADAP_HAS_PID_FILTER |