Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208319
b: refs/heads/master
c: 3b06c21
h: refs/heads/master
i:
  208317: 97a7878
  208315: 2da3e33
  208311: ce3566c
  208303: d0c20b0
  208287: ddd5afe
  208255: 5a6b796
v: v3
  • Loading branch information
Stephen Hemminger authored and Jens Axboe committed Aug 7, 2010
1 parent e2e8348 commit ed6f948
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad96a7a7ea950d5bc9755f2f568be185c7070f1e
refs/heads/master: 3b06c21e8462b77186613e70db286cfa8616088b
16 changes: 8 additions & 8 deletions trunk/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 ed6f948

Please sign in to comment.