From: Stephen Hemminger <shemminger@vyatta.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/8] floppy: remove unnecessary inlines
Date: Wed, 09 Jun 2010 11:34:51 -0700 [thread overview]
Message-ID: <20100609183624.969023160@vyatta.com> (raw)
In-Reply-To: 20100609183449.110905403@vyatta.com
[-- Attachment #1: floppy-deinline.patch --]
[-- Type: text/plain, Size: 2111 bytes --]
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>
--- 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;
next prev parent reply other threads:[~2010-06-09 18:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 18:34 [PATCH 0/8] floppy: cleanup patches Stephen Hemminger
2010-06-09 18:34 ` [PATCH 1/8] floppy: initialize debug jiffies offset Stephen Hemminger
2010-06-09 18:34 ` Stephen Hemminger [this message]
2010-06-09 18:34 ` [PATCH 3/8] floppy: silence warning during disk test Stephen Hemminger
2010-06-09 18:34 ` [PATCH 4/8] floppy: use atomic type for usage_count Stephen Hemminger
2010-06-09 18:34 ` [PATCH 5/8] floppy: cmos attribute should be static Stephen Hemminger
2010-06-09 18:34 ` [PATCH 6/8] floppy: fix signed/unsigned warnings Stephen Hemminger
2010-06-09 18:34 ` [PATCH 7/8] floppy: use wait_event_interruptible Stephen Hemminger
2010-06-09 18:34 ` [PATCH 8/8] floppy: use warning macros Stephen Hemminger
2010-06-09 18:46 ` [PATCH 0/8] floppy: cleanup patches Linus Torvalds
2010-06-09 18:54 ` Stephen Hemminger
2010-06-09 19:04 ` Linus Torvalds
2010-06-11 17:32 ` [RFC] floppy: use single threaded workqueue Stephen Hemminger
2010-06-11 18:56 ` Linus Torvalds
2010-07-21 19:55 ` Marcelo Tosatti
2010-07-22 19:09 ` Linus Torvalds
2010-07-22 22:22 ` david
2010-07-22 23:00 ` Linus Torvalds
2010-08-22 9:07 ` Amos Kong
2010-08-23 22:22 ` Stephen Hemminger
2010-06-10 6:43 ` [PATCH 0/8] floppy: cleanup patches Thomas Meyer
2010-06-11 17:30 ` Stephen Hemminger
2010-06-13 17:23 ` Thomas Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100609183624.969023160@vyatta.com \
--to=shemminger@vyatta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.