Commit 705e28a4 authored by Russell King's avatar Russell King

[ARM] Update fd1772.c

Remove unnecessary use of __inline__, and remove a few unnecessary
prototypes.  copy_buffer is moved before use.
parent 81e7a4c1
...@@ -345,8 +345,6 @@ static void fd_select_drive(int drive); ...@@ -345,8 +345,6 @@ static void fd_select_drive(int drive);
static void fd_deselect(void); static void fd_deselect(void);
static void fd_motor_off_timer(unsigned long dummy); static void fd_motor_off_timer(unsigned long dummy);
static void check_change(unsigned long dummy); static void check_change(unsigned long dummy);
static __inline__ void set_head_settle_flag(void);
static __inline__ int get_head_settle_flag(void);
static void floppy_irqconsequencehandler(void); static void floppy_irqconsequencehandler(void);
static void fd_error(void); static void fd_error(void);
static void do_fd_action(int drive); static void do_fd_action(int drive);
...@@ -363,7 +361,6 @@ static void fd_times_out(unsigned long dummy); ...@@ -363,7 +361,6 @@ static void fd_times_out(unsigned long dummy);
static void finish_fdc(void); static void finish_fdc(void);
static void finish_fdc_done(int dummy); static void finish_fdc_done(int dummy);
static void floppy_off(unsigned int nr); static void floppy_off(unsigned int nr);
static __inline__ void copy_buffer(void *from, void *to);
static void setup_req_params(int drive); static void setup_req_params(int drive);
static void redo_fd_request(void); static void redo_fd_request(void);
static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int
...@@ -543,12 +540,12 @@ static void check_change(unsigned long dummy) ...@@ -543,12 +540,12 @@ static void check_change(unsigned long dummy)
* seek operation, because we don't use seeks with verify. * seek operation, because we don't use seeks with verify.
*/ */
static __inline__ void set_head_settle_flag(void) static inline void set_head_settle_flag(void)
{ {
HeadSettleFlag = FDC1772CMDADD_E; HeadSettleFlag = FDC1772CMDADD_E;
} }
static __inline__ int get_head_settle_flag(void) static inline int get_head_settle_flag(void)
{ {
int tmp = HeadSettleFlag; int tmp = HeadSettleFlag;
HeadSettleFlag = 0; HeadSettleFlag = 0;
...@@ -560,6 +557,15 @@ static __inline__ int get_head_settle_flag(void) ...@@ -560,6 +557,15 @@ static __inline__ int get_head_settle_flag(void)
/* General Interrupt Handling */ /* General Interrupt Handling */
static inline void copy_buffer(void *from, void *to)
{
ulong *p1 = (ulong *) from, *p2 = (ulong *) to;
int cnt;
for (cnt = 512 / 4; cnt; cnt--)
*p2++ = *p1++;
}
static void (*FloppyIRQHandler) (int status) = NULL; static void (*FloppyIRQHandler) (int status) = NULL;
static void floppy_irqconsequencehandler(void) static void floppy_irqconsequencehandler(void)
...@@ -1175,16 +1181,6 @@ static int floppy_revalidate(dev_t dev) ...@@ -1175,16 +1181,6 @@ static int floppy_revalidate(dev_t dev)
return 0; return 0;
} }
static __inline__ void copy_buffer(void *from, void *to)
{
ulong *p1 = (ulong *) from, *p2 = (ulong *) to;
int cnt;
for (cnt = 512 / 4; cnt; cnt--)
*p2++ = *p1++;
}
/* This sets up the global variables describing the current request. */ /* This sets up the global variables describing the current request. */
static void setup_req_params(int drive) static void setup_req_params(int drive)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment