Remove type names used in variables and type definitions for dvi_ctrl_device structure.
Signed-off-by: Pavle Rohalj <[email protected]> --- drivers/staging/sm750fb/ddk750_dvi.c | 24 ++++++++--------- drivers/staging/sm750fb/ddk750_dvi.h | 40 ++++++++++++++-------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c index 943cbcafcffa..2743778abaab 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.c +++ b/drivers/staging/sm750fb/ddk750_dvi.c @@ -14,17 +14,17 @@ static struct dvi_ctrl_device dcft_supported_dvi_controller[] = { #ifdef DVI_CTRL_SII164 { - .pfn_init = sii164_init_chip, - .pfn_get_vendor_id = sii164_get_vendor_id, - .pfn_get_device_id = sii164_get_device_id, + .init = sii164_init_chip, + .get_vendor_id = sii164_get_vendor_id, + .get_device_id = sii164_get_device_id, #ifdef SII164_FULL_FUNCTIONS - .pfn_reset_chip = sii164_reset_chip, - .pfn_get_chip_string = sii164_get_chip_string, - .pfn_set_power = sii164_set_power, - .pfn_enable_hot_plug_detection = sii164_enable_hot_plug_detection, - .pfn_is_connected = sii164_is_connected, - .pfn_check_interrupt = sii164_check_interrupt, - .pfn_clear_interrupt = sii164_clear_interrupt, + .reset_chip = sii164_reset_chip, + .get_chip_string = sii164_get_chip_string, + .set_power = sii164_set_power, + .enable_hot_plug_detection = sii164_enable_hot_plug_detection, + .is_connected = sii164_is_connected, + .check_interrupt = sii164_check_interrupt, + .clear_interrupt = sii164_clear_interrupt, #endif }, #endif @@ -44,8 +44,8 @@ int dvi_init(unsigned char edge_select, struct dvi_ctrl_device *current_dvi_ctrl; current_dvi_ctrl = dcft_supported_dvi_controller; - if (current_dvi_ctrl->pfn_init) { - return current_dvi_ctrl->pfn_init(edge_select, + if (current_dvi_ctrl->init) { + return current_dvi_ctrl->init(edge_select, bus_select, dual_edge_clk_select, hsync_enable, diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h index b2fd56ef51fc..8aee0cdf63a4 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.h +++ b/drivers/staging/sm750fb/ddk750_dvi.h @@ -4,7 +4,7 @@ /* dvi chip stuffs structros */ -typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select, +typedef long (*DVICTRL_INIT)(unsigned char edge_select, unsigned char bus_select, unsigned char dual_edge_clk_select, unsigned char hsync_enable, @@ -15,28 +15,28 @@ typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select, unsigned char pll_filter_enable, unsigned char pll_filter_value); -typedef void (*PFN_DVICTRL_RESETCHIP)(void); -typedef char* (*PFN_DVICTRL_GETCHIPSTRING)(void); -typedef unsigned short (*PFN_DVICTRL_GETVENDORID)(void); -typedef unsigned short (*PFN_DVICTRL_GETDEVICEID)(void); -typedef void (*PFN_DVICTRL_SETPOWER)(unsigned char powerUp); -typedef void (*PFN_DVICTRL_HOTPLUGDETECTION)(unsigned char enableHotPlug); -typedef unsigned char (*PFN_DVICTRL_ISCONNECTED)(void); -typedef unsigned char (*PFN_DVICTRL_CHECKINTERRUPT)(void); -typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void); +typedef void (*DVICTRL_RESETCHIP)(void); +typedef char* (*DVICTRL_GETCHIPSTRING)(void); +typedef unsigned short (*DVICTRL_GETVENDORID)(void); +typedef unsigned short (*DVICTRL_GETDEVICEID)(void); +typedef void (*DVICTRL_SETPOWER)(unsigned char powerUp); +typedef void (*DVICTRL_HOTPLUGDETECTION)(unsigned char enableHotPlug); +typedef unsigned char (*DVICTRL_ISCONNECTED)(void); +typedef unsigned char (*DVICTRL_CHECKINTERRUPT)(void); +typedef void (*DVICTRL_CLEARINTERRUPT)(void); /* Structure to hold all the function pointer to the DVI Controller. */ struct dvi_ctrl_device { - PFN_DVICTRL_INIT pfn_init; - PFN_DVICTRL_RESETCHIP pfn_reset_chip; - PFN_DVICTRL_GETCHIPSTRING pfn_get_chip_string; - PFN_DVICTRL_GETVENDORID pfn_get_vendor_id; - PFN_DVICTRL_GETDEVICEID pfn_get_device_id; - PFN_DVICTRL_SETPOWER pfn_set_power; - PFN_DVICTRL_HOTPLUGDETECTION pfn_enable_hot_plug_detection; - PFN_DVICTRL_ISCONNECTED pfn_is_connected; - PFN_DVICTRL_CHECKINTERRUPT pfn_check_interrupt; - PFN_DVICTRL_CLEARINTERRUPT pfn_clear_interrupt; + DVICTRL_INIT init; + DVICTRL_RESETCHIP reset_chip; + DVICTRL_GETCHIPSTRING get_chip_string; + DVICTRL_GETVENDORID get_vendor_id; + DVICTRL_GETDEVICEID get_device_id; + DVICTRL_SETPOWER set_power; + DVICTRL_HOTPLUGDETECTION enable_hot_plug_detection; + DVICTRL_ISCONNECTED is_connected; + DVICTRL_CHECKINTERRUPT check_interrupt; + DVICTRL_CLEARINTERRUPT clear_interrupt; }; #define DVI_CTRL_SII164 -- 2.30.2
