projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
drivers
/
block
/
null_blk
/
main.c
diff --git
a/drivers/block/null_blk/main.c
b/drivers/block/null_blk/main.c
index
d734e9e
..
187d779
100644
(file)
--- a/
drivers/block/null_blk/main.c
+++ b/
drivers/block/null_blk/main.c
@@
-11,10
+11,6
@@
#include <linux/init.h>
#include "null_blk.h"
#include <linux/init.h>
#include "null_blk.h"
-#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)
-#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT)
-#define SECTOR_MASK (PAGE_SECTORS - 1)
-
#define FREE_BATCH 16
#define TICKS_PER_SEC 50ULL
#define FREE_BATCH 16
#define TICKS_PER_SEC 50ULL
@@
-1721,8
+1717,7
@@
static int null_gendisk_register(struct nullb *nullb)
return ret;
}
return ret;
}
- add_disk(disk);
- return 0;
+ return add_disk(disk);
}
static int null_init_tag_set(struct nullb *nullb, struct blk_mq_tag_set *set)
}
static int null_init_tag_set(struct nullb *nullb, struct blk_mq_tag_set *set)