Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be7a12bb authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jens Axboe
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 285203c8

drivers/block/floppy.c

+7 −7
Original line number Diff line number Diff line
@@ -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;