Prev: [PATCH 1/8] floppy: initialize debug jiffies offset
Next: [PATCH 0/8] floppy: cleanup patches
From: Stephen Hemminger on 9 Jun 2010 15:00
These routines are all big enough that is better to let
the compiler decide to inline or not.

Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>


--- a/drivers/block/floppy.c 2010-06-08 14:54:33.726619979 -0700
+++ b/drivers/block/floppy.c 2010-06-08 14:54:39.187135875 -0700
@@ -899,7 +899,7 @@ static int _lock_fdc(int drive, bool int
_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
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_r
}
}

-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
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;



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 1/8] floppy: initialize debug jiffies offset
Next: [PATCH 0/8] floppy: cleanup patches