diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /drivers/mtd/mtdchar.c | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mtd/mtdchar.c')
| -rw-r--r-- | drivers/mtd/mtdchar.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index b42553cd9af5..5d3ac512ce16 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
| @@ -27,12 +27,10 @@ static void mtd_notify_add(struct mtd_info* mtd) | |||
| 27 | if (!mtd) | 27 | if (!mtd) |
| 28 | return; | 28 | return; |
| 29 | 29 | ||
| 30 | class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), | 30 | device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), "mtd%d", mtd->index); |
| 31 | NULL, "mtd%d", mtd->index); | ||
| 32 | 31 | ||
| 33 | class_device_create(mtd_class, NULL, | 32 | device_create(mtd_class, NULL, |
| 34 | MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), | 33 | MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), "mtd%dro", mtd->index); |
| 35 | NULL, "mtd%dro", mtd->index); | ||
| 36 | } | 34 | } |
| 37 | 35 | ||
| 38 | static void mtd_notify_remove(struct mtd_info* mtd) | 36 | static void mtd_notify_remove(struct mtd_info* mtd) |
| @@ -40,8 +38,8 @@ static void mtd_notify_remove(struct mtd_info* mtd) | |||
| 40 | if (!mtd) | 38 | if (!mtd) |
| 41 | return; | 39 | return; |
| 42 | 40 | ||
| 43 | class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2)); | 41 | device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2)); |
| 44 | class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1)); | 42 | device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1)); |
| 45 | } | 43 | } |
| 46 | 44 | ||
| 47 | static struct mtd_notifier notifier = { | 45 | static struct mtd_notifier notifier = { |