Skip to content

Commit

Permalink
floppy: remove unnecessary inlines
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Hemminger authored and Jens Axboe committed Aug 7, 2010
1 parent 285203c commit be7a12b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit be7a12b

Please sign in to comment.