[PARPORT] [PATCH 2.5.63 8/9] Update the Mutliface 3 parport driver for new module API.

From: Bob Miller (rem@osdl.org)
Date: Thu Feb 27 2003 - 17:05:23 EST

  • Next message: Bob Miller: "[PARPORT] [PATCH 2.5.63 7/9] Update the GSC-Bus parport driver for new module API."

    The patch below updates the Mutliface 3 parallel port driver to use the new
    module interfaces and C99 initializers. This hasn't been tested (sorry no
    hardware).

    -- 
    Bob Miller					Email: rem@osdl.org
    Open Source Development Lab			Phone: 503.626.2455 Ext. 17
    

    diff -Nru a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c --- a/drivers/parport/parport_mfc3.c Thu Feb 27 09:46:20 2003 +++ b/drivers/parport/parport_mfc3.c Thu Feb 27 09:46:20 2003 @@ -281,51 +281,40 @@ pia(p)->cra |= PIA_DDR; } -static void mfc3_inc_use_count(void) -{ - MOD_INC_USE_COUNT; -} - -static void mfc3_dec_use_count(void) -{ - MOD_DEC_USE_COUNT; -} - static struct parport_operations pp_mfc3_ops = { - mfc3_write_data, - mfc3_read_data, + .write_data = mfc3_write_data, + .read_data = mfc3_read_data, - mfc3_write_control, - mfc3_read_control, - mfc3_frob_control, + .write_control = mfc3_write_control, + .read_control = mfc3_read_control, + .frob_control = mfc3_frob_control, - mfc3_read_status, + .read_status = mfc3_read_status, - mfc3_enable_irq, - mfc3_disable_irq, + .enable_irq = mfc3_enable_irq, + .disable_irq = mfc3_disable_irq, - mfc3_data_forward, - mfc3_data_reverse, + .data_forward = mfc3_data_forward, + .data_reverse = mfc3_data_reverse, - mfc3_init_state, - mfc3_save_state, - mfc3_restore_state, + .init_state = mfc3_init_state, + .save_state = mfc3_save_state, + .restore_state = mfc3_restore_state, - mfc3_inc_use_count, - mfc3_dec_use_count, + .epp_write_data = parport_ieee1284_epp_write_data, + .epp_read_data = parport_ieee1284_epp_read_data, + .epp_write_addr = parport_ieee1284_epp_write_addr, + .epp_read_addr = parport_ieee1284_epp_read_addr, - parport_ieee1284_epp_write_data, - parport_ieee1284_epp_read_data, - parport_ieee1284_epp_write_addr, - parport_ieee1284_epp_read_addr, + .ecp_write_data = parport_ieee1284_ecp_write_data, + .ecp_read_data = parport_ieee1284_ecp_read_data, + .ecp_write_addr = parport_ieee1284_ecp_write_addr, - parport_ieee1284_ecp_write_data, - parport_ieee1284_ecp_read_data, - parport_ieee1284_ecp_write_addr, + .compat_write_data = parport_ieee1284_write_compat, + .nibble_read_data = parport_ieee1284_read_nibble, + .byte_read_data = parport_ieee1284_read_byte, - parport_ieee1284_write_compat, - parport_ieee1284_read_nibble, - parport_ieee1284_read_byte, + .owner = THIS_MODULE, }; /* ----------- Initialisation code --------------------------------- */

    -- To unsubscribe, send mail to: linux-parport-request@torque.net -- -- with the single word "unsubscribe" in the body of the message. --



    This archive was generated by hypermail 2b29 : Thu Feb 27 2003 - 17:16:35 EST