Skip to content

Commit

Permalink
floppy: make controller const
Browse files Browse the repository at this point in the history
The struct cont_t is just a set of virtual function pointers.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Stephen Hemminger authored and Jens Axboe committed Aug 7, 2010
1 parent ad96a7a commit 3b06c21
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ static int max_buffer_sectors;

static int *errors;
typedef void (*done_f)(int);
static struct cont_t {
static const struct cont_t {
void (*interrupt)(void);
/* this is called after the interrupt of the
* main command */
Expand Down Expand Up @@ -1970,14 +1970,14 @@ static void do_wakeup(void)
wake_up(&command_done);
}

static struct cont_t wakeup_cont = {
static const struct cont_t wakeup_cont = {
.interrupt = empty,
.redo = do_wakeup,
.error = empty,
.done = (done_f)empty
};

static struct cont_t intr_cont = {
static const struct cont_t intr_cont = {
.interrupt = empty,
.redo = process_fd_request,
.error = empty,
Expand Down Expand Up @@ -2183,7 +2183,7 @@ static void redo_format(void)
debugt(__func__, "queue format request");
}

static struct cont_t format_cont = {
static const struct cont_t format_cont = {
.interrupt = format_interrupt,
.redo = redo_format,
.error = bad_flp_intr,
Expand Down Expand Up @@ -2879,7 +2879,7 @@ static void redo_fd_request(void)
return;
}

static struct cont_t rw_cont = {
static const struct cont_t rw_cont = {
.interrupt = rw_interrupt,
.redo = redo_fd_request,
.error = bad_flp_intr,
Expand Down Expand Up @@ -2915,7 +2915,7 @@ static void do_fd_request(struct request_queue *q)
is_alive(__func__, "");
}

static struct cont_t poll_cont = {
static const struct cont_t poll_cont = {
.interrupt = success_and_wakeup,
.redo = floppy_ready,
.error = generic_failure,
Expand Down Expand Up @@ -2946,7 +2946,7 @@ static void reset_intr(void)
pr_info("weird, reset interrupt called\n");
}

static struct cont_t reset_cont = {
static const struct cont_t reset_cont = {
.interrupt = reset_intr,
.redo = success_and_wakeup,
.error = generic_failure,
Expand Down Expand Up @@ -3051,7 +3051,7 @@ static void raw_cmd_done(int flag)
generic_done(flag);
}

static struct cont_t raw_cmd_cont = {
static const struct cont_t raw_cmd_cont = {
.interrupt = success_and_wakeup,
.redo = floppy_start,
.error = generic_failure,
Expand Down

0 comments on commit 3b06c21

Please sign in to comment.