diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2010-06-15 13:21:11 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:15:32 +0200 |
| commit | be7a12bb1a7dc185d5143e3ae434f8a855f66a31 (patch) | |
| tree | 55dfe676befac46dad8f5c49157661ee48794733 /drivers/block/floppy.c | |
| parent | 285203c8ff541a775f27148c06c58b96822d8b68 (diff) | |
| download | kernel_samsung_aries-be7a12bb1a7dc185d5143e3ae434f8a855f66a31.zip kernel_samsung_aries-be7a12bb1a7dc185d5143e3ae434f8a855f66a31.tar.gz kernel_samsung_aries-be7a12bb1a7dc185d5143e3ae434f8a855f66a31.tar.bz2 | |
floppy: remove unnecessary inlines
These routines are all big enough that is better to let the compiler
decide to inline or not.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 0cb24f00..7ba239e 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -899,7 +899,7 @@ static int _lock_fdc(int drive, bool interruptible, int line) _lock_fdc(drive, interruptible, __LINE__) /* unlocks the driver */ -static inline void unlock_fdc(void) +static void unlock_fdc(void) { unsigned long flags; @@ -1224,7 +1224,7 @@ static int need_more_output(void) /* Set perpendicular mode as required, based on data rate, if supported. * 82077 Now tested. 1Mbps data rate only possible with 82077-1. */ -static inline void perpendicular_mode(void) +static void perpendicular_mode(void) { unsigned char perp_mode; @@ -3033,7 +3033,7 @@ static inline int fd_copyin(void __user *param, void *address, return copy_from_user(address, param, size) ? -EFAULT : 0; } -static inline const char *drive_name(int type, int drive) +static const char *drive_name(int type, int drive) { struct floppy_struct *floppy; @@ -3103,7 +3103,7 @@ static struct cont_t raw_cmd_cont = { .done = raw_cmd_done }; -static inline int raw_cmd_copyout(int cmd, void __user *param, +static int raw_cmd_copyout(int cmd, void __user *param, struct floppy_raw_cmd *ptr) { int ret; @@ -3148,7 +3148,7 @@ static void raw_cmd_free(struct floppy_raw_cmd **ptr) } } -static inline int raw_cmd_copyin(int cmd, void __user *param, +static int raw_cmd_copyin(int cmd, void __user *param, struct floppy_raw_cmd **rcmd) { struct floppy_raw_cmd *ptr; @@ -3266,7 +3266,7 @@ static int invalidate_drive(struct block_device *bdev) return 0; } -static inline int set_geometry(unsigned int cmd, struct floppy_struct *g, +static int set_geometry(unsigned int cmd, struct floppy_struct *g, int drive, int type, struct block_device *bdev) { int cnt; @@ -3365,7 +3365,7 @@ static int ioctl_table[] = { FDTWADDLE }; -static inline int normalize_ioctl(int *cmd, int *size) +static int normalize_ioctl(int *cmd, int *size) { int i; |