diff options
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/ftdi-elan.c | 10 | ||||
-rw-r--r-- | drivers/usb/misc/usb_u132.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index 0e8ee2dea881..cb0ba3107d7f 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c | |||
@@ -303,7 +303,7 @@ void ftdi_elan_gone_away(struct platform_device *pdev) | |||
303 | 303 | ||
304 | 304 | ||
305 | EXPORT_SYMBOL_GPL(ftdi_elan_gone_away); | 305 | EXPORT_SYMBOL_GPL(ftdi_elan_gone_away); |
306 | void ftdi_release_platform_dev(struct device *dev) | 306 | static void ftdi_release_platform_dev(struct device *dev) |
307 | { | 307 | { |
308 | dev->parent = NULL; | 308 | dev->parent = NULL; |
309 | } | 309 | } |
@@ -1426,14 +1426,6 @@ static int ftdi_elan_read_reg(struct usb_ftdi *ftdi, u32 *data) | |||
1426 | } | 1426 | } |
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | int usb_ftdi_elan_read_reg(struct platform_device *pdev, u32 *data) | ||
1430 | { | ||
1431 | struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev); | ||
1432 | return ftdi_elan_read_reg(ftdi, data); | ||
1433 | } | ||
1434 | |||
1435 | |||
1436 | EXPORT_SYMBOL_GPL(usb_ftdi_elan_read_reg); | ||
1437 | static int ftdi_elan_read_config(struct usb_ftdi *ftdi, int config_offset, | 1429 | static int ftdi_elan_read_config(struct usb_ftdi *ftdi, int config_offset, |
1438 | u8 width, u32 *data) | 1430 | u8 width, u32 *data) |
1439 | { | 1431 | { |
diff --git a/drivers/usb/misc/usb_u132.h b/drivers/usb/misc/usb_u132.h index 551ba8906d62..fbb52b21349e 100644 --- a/drivers/usb/misc/usb_u132.h +++ b/drivers/usb/misc/usb_u132.h | |||
@@ -95,3 +95,7 @@ int usb_ftdi_elan_edset_setup(struct platform_device *pdev, u8 ed_number, | |||
95 | int halted, int skipped, int actual, int non_null)); | 95 | int halted, int skipped, int actual, int non_null)); |
96 | int usb_ftdi_elan_edset_flush(struct platform_device *pdev, u8 ed_number, | 96 | int usb_ftdi_elan_edset_flush(struct platform_device *pdev, u8 ed_number, |
97 | void *endp); | 97 | void *endp); |
98 | int usb_ftdi_elan_read_pcimem(struct platform_device *pdev, int mem_offset, | ||
99 | u8 width, u32 *data); | ||
100 | int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, int mem_offset, | ||
101 | u8 width, u32 data); | ||