Commit 3b06c21e authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jens Axboe

floppy: make controller const

The struct cont_t is just a set of virtual function pointers.
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 ad96a7a7
...@@ -538,7 +538,7 @@ static int max_buffer_sectors; ...@@ -538,7 +538,7 @@ static int max_buffer_sectors;
static int *errors; static int *errors;
typedef void (*done_f)(int); typedef void (*done_f)(int);
static struct cont_t { static const struct cont_t {
void (*interrupt)(void); void (*interrupt)(void);
/* this is called after the interrupt of the /* this is called after the interrupt of the
* main command */ * main command */
...@@ -1970,14 +1970,14 @@ static void do_wakeup(void) ...@@ -1970,14 +1970,14 @@ static void do_wakeup(void)
wake_up(&command_done); wake_up(&command_done);
} }
static struct cont_t wakeup_cont = { static const struct cont_t wakeup_cont = {
.interrupt = empty, .interrupt = empty,
.redo = do_wakeup, .redo = do_wakeup,
.error = empty, .error = empty,
.done = (done_f)empty .done = (done_f)empty
}; };
static struct cont_t intr_cont = { static const struct cont_t intr_cont = {
.interrupt = empty, .interrupt = empty,
.redo = process_fd_request, .redo = process_fd_request,
.error = empty, .error = empty,
...@@ -2183,7 +2183,7 @@ static void redo_format(void) ...@@ -2183,7 +2183,7 @@ static void redo_format(void)
debugt(__func__, "queue format request"); debugt(__func__, "queue format request");
} }
static struct cont_t format_cont = { static const struct cont_t format_cont = {
.interrupt = format_interrupt, .interrupt = format_interrupt,
.redo = redo_format, .redo = redo_format,
.error = bad_flp_intr, .error = bad_flp_intr,
...@@ -2879,7 +2879,7 @@ static void redo_fd_request(void) ...@@ -2879,7 +2879,7 @@ static void redo_fd_request(void)
return; return;
} }
static struct cont_t rw_cont = { static const struct cont_t rw_cont = {
.interrupt = rw_interrupt, .interrupt = rw_interrupt,
.redo = redo_fd_request, .redo = redo_fd_request,
.error = bad_flp_intr, .error = bad_flp_intr,
...@@ -2915,7 +2915,7 @@ static void do_fd_request(struct request_queue *q) ...@@ -2915,7 +2915,7 @@ static void do_fd_request(struct request_queue *q)
is_alive(__func__, ""); is_alive(__func__, "");
} }
static struct cont_t poll_cont = { static const struct cont_t poll_cont = {
.interrupt = success_and_wakeup, .interrupt = success_and_wakeup,
.redo = floppy_ready, .redo = floppy_ready,
.error = generic_failure, .error = generic_failure,
...@@ -2946,7 +2946,7 @@ static void reset_intr(void) ...@@ -2946,7 +2946,7 @@ static void reset_intr(void)
pr_info("weird, reset interrupt called\n"); pr_info("weird, reset interrupt called\n");
} }
static struct cont_t reset_cont = { static const struct cont_t reset_cont = {
.interrupt = reset_intr, .interrupt = reset_intr,
.redo = success_and_wakeup, .redo = success_and_wakeup,
.error = generic_failure, .error = generic_failure,
...@@ -3051,7 +3051,7 @@ static void raw_cmd_done(int flag) ...@@ -3051,7 +3051,7 @@ static void raw_cmd_done(int flag)
generic_done(flag); generic_done(flag);
} }
static struct cont_t raw_cmd_cont = { static const struct cont_t raw_cmd_cont = {
.interrupt = success_and_wakeup, .interrupt = success_and_wakeup,
.redo = floppy_start, .redo = floppy_start,
.error = generic_failure, .error = generic_failure,
......
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