@@ -107,26 +107,26 @@ struct ftdi_quirk {
107107};
108108
109109static int ftdi_jtag_probe (struct usb_serial * serial );
110- static int ftdi_NDI_device_setup (struct usb_serial * serial );
110+ static int ftdi_ndi_probe (struct usb_serial * serial );
111111static int ftdi_stmclite_probe (struct usb_serial * serial );
112112static int ftdi_8u2232c_probe (struct usb_serial * serial );
113- static void ftdi_USB_UIRT_setup (struct ftdi_private * priv );
114- static void ftdi_HE_TIRA1_setup (struct ftdi_private * priv );
113+ static void ftdi_usb_uirt_setup (struct ftdi_private * priv );
114+ static void ftdi_he_tira1_setup (struct ftdi_private * priv );
115115
116116static const struct ftdi_quirk ftdi_jtag_quirk = {
117117 .probe = ftdi_jtag_probe ,
118118};
119119
120- static const struct ftdi_quirk ftdi_NDI_device_quirk = {
121- .probe = ftdi_NDI_device_setup ,
120+ static const struct ftdi_quirk ftdi_ndi_quirk = {
121+ .probe = ftdi_ndi_probe ,
122122};
123123
124- static const struct ftdi_quirk ftdi_USB_UIRT_quirk = {
125- .port_probe = ftdi_USB_UIRT_setup ,
124+ static const struct ftdi_quirk ftdi_usb_uirt_quirk = {
125+ .port_probe = ftdi_usb_uirt_setup ,
126126};
127127
128- static const struct ftdi_quirk ftdi_HE_TIRA1_quirk = {
129- .port_probe = ftdi_HE_TIRA1_setup ,
128+ static const struct ftdi_quirk ftdi_he_tira1_quirk = {
129+ .port_probe = ftdi_he_tira1_setup ,
130130};
131131
132132static const struct ftdi_quirk ftdi_stmclite_quirk = {
@@ -590,9 +590,9 @@ static const struct usb_device_id id_table_combined[] = {
590590 { USB_DEVICE (OCT_VID , OCT_US101_PID ) },
591591 { USB_DEVICE (OCT_VID , OCT_DK201_PID ) },
592592 { USB_DEVICE (FTDI_VID , FTDI_HE_TIRA1_PID ),
593- .driver_info = (kernel_ulong_t )& ftdi_HE_TIRA1_quirk },
593+ .driver_info = (kernel_ulong_t )& ftdi_he_tira1_quirk },
594594 { USB_DEVICE (FTDI_VID , FTDI_USB_UIRT_PID ),
595- .driver_info = (kernel_ulong_t )& ftdi_USB_UIRT_quirk },
595+ .driver_info = (kernel_ulong_t )& ftdi_usb_uirt_quirk },
596596 { USB_DEVICE (FTDI_VID , PROTEGO_SPECIAL_1 ) },
597597 { USB_DEVICE (FTDI_VID , PROTEGO_R2X0 ) },
598598 { USB_DEVICE (FTDI_VID , PROTEGO_SPECIAL_3 ) },
@@ -792,17 +792,17 @@ static const struct usb_device_id id_table_combined[] = {
792792 { USB_DEVICE (FTDI_VID , FTDI_TACTRIX_OPENPORT_13U_PID ) },
793793 { USB_DEVICE (ELEKTOR_VID , ELEKTOR_FT323R_PID ) },
794794 { USB_DEVICE (FTDI_VID , FTDI_NDI_HUC_PID ),
795- .driver_info = (kernel_ulong_t )& ftdi_NDI_device_quirk },
795+ .driver_info = (kernel_ulong_t )& ftdi_ndi_quirk },
796796 { USB_DEVICE (FTDI_VID , FTDI_NDI_SPECTRA_SCU_PID ),
797- .driver_info = (kernel_ulong_t )& ftdi_NDI_device_quirk },
797+ .driver_info = (kernel_ulong_t )& ftdi_ndi_quirk },
798798 { USB_DEVICE (FTDI_VID , FTDI_NDI_FUTURE_2_PID ),
799- .driver_info = (kernel_ulong_t )& ftdi_NDI_device_quirk },
799+ .driver_info = (kernel_ulong_t )& ftdi_ndi_quirk },
800800 { USB_DEVICE (FTDI_VID , FTDI_NDI_FUTURE_3_PID ),
801- .driver_info = (kernel_ulong_t )& ftdi_NDI_device_quirk },
801+ .driver_info = (kernel_ulong_t )& ftdi_ndi_quirk },
802802 { USB_DEVICE (FTDI_VID , FTDI_NDI_AURORA_SCU_PID ),
803- .driver_info = (kernel_ulong_t )& ftdi_NDI_device_quirk },
803+ .driver_info = (kernel_ulong_t )& ftdi_ndi_quirk },
804804 { USB_DEVICE (FTDI_NDI_VID , FTDI_NDI_EMGUIDE_GEMINI_PID ),
805- .driver_info = (kernel_ulong_t )& ftdi_NDI_device_quirk },
805+ .driver_info = (kernel_ulong_t )& ftdi_ndi_quirk },
806806 { USB_DEVICE (TELLDUS_VID , TELLDUS_TELLSTICK_PID ) },
807807 { USB_DEVICE (NOVITUS_VID , NOVITUS_BONO_E_PID ) },
808808 { USB_DEVICE (FTDI_VID , RTSYSTEMS_USB_VX8_PID ) },
@@ -2234,7 +2234,7 @@ static int ftdi_port_probe(struct usb_serial_port *port)
22342234 * Setup for the USB-UIRT device, which requires hardwired baudrate
22352235 * (38400 gets mapped to 312500).
22362236 */
2237- static void ftdi_USB_UIRT_setup (struct ftdi_private * priv )
2237+ static void ftdi_usb_uirt_setup (struct ftdi_private * priv )
22382238{
22392239 priv -> flags |= ASYNC_SPD_CUST ;
22402240 priv -> custom_divisor = 77 ;
@@ -2245,7 +2245,7 @@ static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)
22452245 * Setup for the HE-TIRA1 device, which requires hardwired baudrate
22462246 * (38400 gets mapped to 100000) and RTS-CTS enabled.
22472247 */
2248- static void ftdi_HE_TIRA1_setup (struct ftdi_private * priv )
2248+ static void ftdi_he_tira1_setup (struct ftdi_private * priv )
22492249{
22502250 priv -> flags |= ASYNC_SPD_CUST ;
22512251 priv -> custom_divisor = 240 ;
@@ -2264,7 +2264,7 @@ static int ndi_latency_timer = 1;
22642264 * Setup for the NDI FTDI-based USB devices, which requires hardwired
22652265 * baudrate (19200 gets mapped to 1200000).
22662266 */
2267- static int ftdi_NDI_device_setup (struct usb_serial * serial )
2267+ static int ftdi_ndi_probe (struct usb_serial * serial )
22682268{
22692269 struct usb_device * udev = serial -> dev ;
22702270 int latency = ndi_latency_timer ;
0 commit comments