Commit 1a48e7c7 authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman

[PATCH] drivers/w1/dscore: fix the inline mess

Remove unneded inlines.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent e0f1bc68
...@@ -35,26 +35,26 @@ MODULE_DEVICE_TABLE(usb, ds_id_table); ...@@ -35,26 +35,26 @@ MODULE_DEVICE_TABLE(usb, ds_id_table);
int ds_probe(struct usb_interface *, const struct usb_device_id *); int ds_probe(struct usb_interface *, const struct usb_device_id *);
void ds_disconnect(struct usb_interface *); void ds_disconnect(struct usb_interface *);
inline int ds_touch_bit(struct ds_device *, u8, u8 *); int ds_touch_bit(struct ds_device *, u8, u8 *);
inline int ds_read_byte(struct ds_device *, u8 *); int ds_read_byte(struct ds_device *, u8 *);
inline int ds_read_bit(struct ds_device *, u8 *); int ds_read_bit(struct ds_device *, u8 *);
inline int ds_write_byte(struct ds_device *, u8); int ds_write_byte(struct ds_device *, u8);
inline int ds_write_bit(struct ds_device *, u8); int ds_write_bit(struct ds_device *, u8);
inline int ds_start_pulse(struct ds_device *, int); int ds_start_pulse(struct ds_device *, int);
inline int ds_set_speed(struct ds_device *, int); int ds_set_speed(struct ds_device *, int);
inline int ds_reset(struct ds_device *, struct ds_status *); int ds_reset(struct ds_device *, struct ds_status *);
inline int ds_detect(struct ds_device *, struct ds_status *); int ds_detect(struct ds_device *, struct ds_status *);
inline int ds_stop_pulse(struct ds_device *, int); int ds_stop_pulse(struct ds_device *, int);
inline int ds_send_data(struct ds_device *, unsigned char *, int); int ds_send_data(struct ds_device *, unsigned char *, int);
inline int ds_recv_data(struct ds_device *, unsigned char *, int); int ds_recv_data(struct ds_device *, unsigned char *, int);
inline int ds_recv_status(struct ds_device *, struct ds_status *); int ds_recv_status(struct ds_device *, struct ds_status *);
inline struct ds_device * ds_get_device(void); struct ds_device * ds_get_device(void);
inline void ds_put_device(struct ds_device *); void ds_put_device(struct ds_device *);
static inline void ds_dump_status(unsigned char *, unsigned char *, int); static inline void ds_dump_status(unsigned char *, unsigned char *, int);
static inline int ds_send_control(struct ds_device *, u16, u16); static int ds_send_control(struct ds_device *, u16, u16);
static inline int ds_send_control_mode(struct ds_device *, u16, u16); static int ds_send_control_mode(struct ds_device *, u16, u16);
static inline int ds_send_control_cmd(struct ds_device *, u16, u16); static int ds_send_control_cmd(struct ds_device *, u16, u16);
static struct usb_driver ds_driver = { static struct usb_driver ds_driver = {
...@@ -503,7 +503,7 @@ int ds_read_byte(struct ds_device *dev, u8 *byte) ...@@ -503,7 +503,7 @@ int ds_read_byte(struct ds_device *dev, u8 *byte)
return 0; return 0;
} }
inline int ds_read_block(struct ds_device *dev, u8 *buf, int len) int ds_read_block(struct ds_device *dev, u8 *buf, int len)
{ {
struct ds_status st; struct ds_status st;
int err; int err;
...@@ -529,7 +529,7 @@ inline int ds_read_block(struct ds_device *dev, u8 *buf, int len) ...@@ -529,7 +529,7 @@ inline int ds_read_block(struct ds_device *dev, u8 *buf, int len)
return err; return err;
} }
inline int ds_write_block(struct ds_device *dev, u8 *buf, int len) int ds_write_block(struct ds_device *dev, u8 *buf, int len)
{ {
int err; int err;
struct ds_status st; struct ds_status st;
......
...@@ -151,23 +151,23 @@ struct ds_status ...@@ -151,23 +151,23 @@ struct ds_status
}; };
inline int ds_touch_bit(struct ds_device *, u8, u8 *); int ds_touch_bit(struct ds_device *, u8, u8 *);
inline int ds_read_byte(struct ds_device *, u8 *); int ds_read_byte(struct ds_device *, u8 *);
inline int ds_read_bit(struct ds_device *, u8 *); int ds_read_bit(struct ds_device *, u8 *);
inline int ds_write_byte(struct ds_device *, u8); int ds_write_byte(struct ds_device *, u8);
inline int ds_write_bit(struct ds_device *, u8); int ds_write_bit(struct ds_device *, u8);
inline int ds_start_pulse(struct ds_device *, int); int ds_start_pulse(struct ds_device *, int);
inline int ds_set_speed(struct ds_device *, int); int ds_set_speed(struct ds_device *, int);
inline int ds_reset(struct ds_device *, struct ds_status *); int ds_reset(struct ds_device *, struct ds_status *);
inline int ds_detect(struct ds_device *, struct ds_status *); int ds_detect(struct ds_device *, struct ds_status *);
inline int ds_stop_pulse(struct ds_device *, int); int ds_stop_pulse(struct ds_device *, int);
inline int ds_send_data(struct ds_device *, unsigned char *, int); int ds_send_data(struct ds_device *, unsigned char *, int);
inline int ds_recv_data(struct ds_device *, unsigned char *, int); int ds_recv_data(struct ds_device *, unsigned char *, int);
inline int ds_recv_status(struct ds_device *, struct ds_status *); int ds_recv_status(struct ds_device *, struct ds_status *);
inline struct ds_device * ds_get_device(void); struct ds_device * ds_get_device(void);
inline void ds_put_device(struct ds_device *); void ds_put_device(struct ds_device *);
inline int ds_write_block(struct ds_device *, u8 *, int); int ds_write_block(struct ds_device *, u8 *, int);
inline int ds_read_block(struct ds_device *, u8 *, int); int ds_read_block(struct ds_device *, u8 *, int);
#endif /* __DSCORE_H */ #endif /* __DSCORE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment