* Fix broken module aliases in ieee1394
@ 2005-09-29 18:57 Dave Jones
2005-09-29 19:10 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Dave Jones @ 2005-09-29 18:57 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=134047
The ieee1394 drivers have buggered module aliases.
alias: char-major-171-0 * 16
This is because MODULE_ALIAS_CHARDEV stringifies its arguments.
Signed-off-by: Dave Jones <davej@redhat.com>
--- linux-2.6.13/drivers/ieee1394/amdtp.c~ 2005-09-29 03:50:20.000000000 -0400
+++ linux-2.6.13/drivers/ieee1394/amdtp.c 2005-09-29 03:50:54.000000000 -0400
@@ -1234,7 +1234,7 @@ static void amdtp_add_host(struct hpsb_h
hpsb_set_hostinfo_key(&amdtp_highlevel, host, ah->host->id);
- minor = IEEE1394_MINOR_BLOCK_AMDTP * 16 + ah->host->id;
+ minor = IEEE1394_MINOR_BLOCK_AMDTP + ah->host->id;
INIT_LIST_HEAD(&ah->stream_list);
spin_lock_init(&ah->stream_list_lock);
@@ -1297,4 +1297,4 @@ static void __exit amdtp_exit_module (vo
module_init(amdtp_init_module);
module_exit(amdtp_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16);
+MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP);
--- linux-2.6.13/drivers/ieee1394/dv1394.c~ 2005-09-29 03:51:08.000000000 -0400
+++ linux-2.6.13/drivers/ieee1394/dv1394.c 2005-09-29 03:51:26.000000000 -0400
@@ -2344,7 +2344,7 @@ static void dv1394_remove_host (struct h
} while (video != NULL);
class_device_destroy(hpsb_protocol_class,
- MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
+ MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 + (id<<2)));
devfs_remove("ieee1394/dv/host%d/NTSC", id);
devfs_remove("ieee1394/dv/host%d/PAL", id);
devfs_remove("ieee1394/dv/host%d", id);
@@ -2362,7 +2362,7 @@ static void dv1394_add_host (struct hpsb
ohci = (struct ti_ohci *)host->hostdata;
class_device_create(hpsb_protocol_class, MKDEV(
- IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)),
+ IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 + (id<<2)),
NULL, "dv1394-%d", id);
devfs_mk_dir("ieee1394/dv/host%d", id);
devfs_mk_dir("ieee1394/dv/host%d/NTSC", id);
@@ -2660,4 +2660,4 @@ static int __init dv1394_init_module(voi
module_init(dv1394_init_module);
module_exit(dv1394_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16);
+MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394);
--- linux-2.6.13/drivers/ieee1394/raw1394.c~ 2005-09-29 03:51:34.000000000 -0400
+++ linux-2.6.13/drivers/ieee1394/raw1394.c 2005-09-29 03:51:53.000000000 -0400
@@ -2905,14 +2905,14 @@ static int __init init_raw1394(void)
hpsb_register_highlevel(&raw1394_highlevel);
if (IS_ERR(class_device_create(hpsb_protocol_class, MKDEV(
- IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
+ IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394),
NULL, RAW1394_DEVICE_NAME))) {
ret = -EFAULT;
goto out_unreg;
}
devfs_mk_cdev(MKDEV(
- IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
+ IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394),
S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME);
cdev_init(&raw1394_cdev, &raw1394_fops);
@@ -2938,7 +2938,7 @@ static int __init init_raw1394(void)
out_dev:
devfs_remove(RAW1394_DEVICE_NAME);
class_device_destroy(hpsb_protocol_class,
- MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
+ MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394));
out_unreg:
hpsb_unregister_highlevel(&raw1394_highlevel);
out:
@@ -2948,7 +2948,7 @@ out:
static void __exit cleanup_raw1394(void)
{
class_device_destroy(hpsb_protocol_class,
- MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
+ MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394));
cdev_del(&raw1394_cdev);
devfs_remove(RAW1394_DEVICE_NAME);
hpsb_unregister_highlevel(&raw1394_highlevel);
@@ -2958,4 +2958,4 @@ static void __exit cleanup_raw1394(void)
module_init(init_raw1394);
module_exit(cleanup_raw1394);
MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16);
+MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394);
--- linux-2.6.13/drivers/ieee1394/video1394.c~ 2005-09-29 03:51:59.000000000 -0400
+++ linux-2.6.13/drivers/ieee1394/video1394.c 2005-09-29 03:52:10.000000000 -0400
@@ -1369,7 +1369,7 @@ static void video1394_add_host (struct h
hpsb_set_hostinfo(&video1394_highlevel, host, ohci);
hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id);
- minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id;
+ minor = IEEE1394_MINOR_BLOCK_VIDEO1394 + ohci->host->id;
class_device_create(hpsb_protocol_class, MKDEV(
IEEE1394_MAJOR, minor),
NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
@@ -1385,7 +1385,7 @@ static void video1394_remove_host (struc
if (ohci) {
class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
- IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id));
+ IEEE1394_MINOR_BLOCK_VIDEO1394 + ohci->host->id));
devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
}
@@ -1571,4 +1571,4 @@ static int __init video1394_init_module
module_init(video1394_init_module);
module_exit(video1394_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16);
+MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394);
--- linux-2.6.13/drivers/ieee1394/ieee1394_core.h~ 2005-09-29 03:52:20.000000000 -0400
+++ linux-2.6.13/drivers/ieee1394/ieee1394_core.h 2005-09-29 03:53:14.000000000 -0400
@@ -200,17 +200,17 @@ void hpsb_packet_received(struct hpsb_ho
#define IEEE1394_MAJOR 171
#define IEEE1394_MINOR_BLOCK_RAW1394 0
-#define IEEE1394_MINOR_BLOCK_VIDEO1394 1
-#define IEEE1394_MINOR_BLOCK_DV1394 2
-#define IEEE1394_MINOR_BLOCK_AMDTP 3
+#define IEEE1394_MINOR_BLOCK_VIDEO1394 (1*16)
+#define IEEE1394_MINOR_BLOCK_DV1394 (2*16)
+#define IEEE1394_MINOR_BLOCK_AMDTP (3*16)
#define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15
#define IEEE1394_CORE_DEV MKDEV(IEEE1394_MAJOR, 0)
-#define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)
-#define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16)
-#define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16)
-#define IEEE1394_AMDTP_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16)
-#define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16)
+#define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394)
+#define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394)
+#define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394)
+#define IEEE1394_AMDTP_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP)
+#define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL)
/* return the index (within a minor number block) of a file */
static inline unsigned char ieee1394_file_to_instance(struct file *file)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fix broken module aliases in ieee1394
2005-09-29 18:57 Fix broken module aliases in ieee1394 Dave Jones
@ 2005-09-29 19:10 ` Andrew Morton
2005-09-29 19:51 ` Jody McIntyre
2005-09-29 20:36 ` Stefan Richter
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Morton @ 2005-09-29 19:10 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-kernel, linux1394-devel, Jody McIntyre
Dave Jones <davej@redhat.com> wrote:
>
> https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=134047
>
> The ieee1394 drivers have buggered module aliases.
>
> alias: char-major-171-0 * 16
>
> This is because MODULE_ALIAS_CHARDEV stringifies its arguments.
>
hm. There are a bunch of 1394 patches in -mm which appear to remove
most/all of this stuff.
So what-the-heck I think I'll send those patches on to Linus today. Please
review the result and send any remaining fixups on to Linus for 2.6.14.
(I'm offline for ~10 days, starting tomorrow).
>
> --- linux-2.6.13/drivers/ieee1394/amdtp.c~ 2005-09-29 03:50:20.000000000 -0400
> +++ linux-2.6.13/drivers/ieee1394/amdtp.c 2005-09-29 03:50:54.000000000 -0400
> @@ -1234,7 +1234,7 @@ static void amdtp_add_host(struct hpsb_h
>
> hpsb_set_hostinfo_key(&amdtp_highlevel, host, ah->host->id);
>
> - minor = IEEE1394_MINOR_BLOCK_AMDTP * 16 + ah->host->id;
> + minor = IEEE1394_MINOR_BLOCK_AMDTP + ah->host->id;
>
> INIT_LIST_HEAD(&ah->stream_list);
> spin_lock_init(&ah->stream_list_lock);
> @@ -1297,4 +1297,4 @@ static void __exit amdtp_exit_module (vo
>
> module_init(amdtp_init_module);
> module_exit(amdtp_exit_module);
> -MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16);
> +MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP);
> --- linux-2.6.13/drivers/ieee1394/dv1394.c~ 2005-09-29 03:51:08.000000000 -0400
> +++ linux-2.6.13/drivers/ieee1394/dv1394.c 2005-09-29 03:51:26.000000000 -0400
> @@ -2344,7 +2344,7 @@ static void dv1394_remove_host (struct h
> } while (video != NULL);
>
> class_device_destroy(hpsb_protocol_class,
> - MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
> + MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 + (id<<2)));
> devfs_remove("ieee1394/dv/host%d/NTSC", id);
> devfs_remove("ieee1394/dv/host%d/PAL", id);
> devfs_remove("ieee1394/dv/host%d", id);
> @@ -2362,7 +2362,7 @@ static void dv1394_add_host (struct hpsb
> ohci = (struct ti_ohci *)host->hostdata;
>
> class_device_create(hpsb_protocol_class, MKDEV(
> - IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)),
> + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 + (id<<2)),
> NULL, "dv1394-%d", id);
> devfs_mk_dir("ieee1394/dv/host%d", id);
> devfs_mk_dir("ieee1394/dv/host%d/NTSC", id);
> @@ -2660,4 +2660,4 @@ static int __init dv1394_init_module(voi
>
> module_init(dv1394_init_module);
> module_exit(dv1394_exit_module);
> -MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16);
> +MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394);
> --- linux-2.6.13/drivers/ieee1394/raw1394.c~ 2005-09-29 03:51:34.000000000 -0400
> +++ linux-2.6.13/drivers/ieee1394/raw1394.c 2005-09-29 03:51:53.000000000 -0400
> @@ -2905,14 +2905,14 @@ static int __init init_raw1394(void)
> hpsb_register_highlevel(&raw1394_highlevel);
>
> if (IS_ERR(class_device_create(hpsb_protocol_class, MKDEV(
> - IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
> + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394),
> NULL, RAW1394_DEVICE_NAME))) {
> ret = -EFAULT;
> goto out_unreg;
> }
>
> devfs_mk_cdev(MKDEV(
> - IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
> + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394),
> S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME);
>
> cdev_init(&raw1394_cdev, &raw1394_fops);
> @@ -2938,7 +2938,7 @@ static int __init init_raw1394(void)
> out_dev:
> devfs_remove(RAW1394_DEVICE_NAME);
> class_device_destroy(hpsb_protocol_class,
> - MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
> + MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394));
> out_unreg:
> hpsb_unregister_highlevel(&raw1394_highlevel);
> out:
> @@ -2948,7 +2948,7 @@ out:
> static void __exit cleanup_raw1394(void)
> {
> class_device_destroy(hpsb_protocol_class,
> - MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
> + MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394));
> cdev_del(&raw1394_cdev);
> devfs_remove(RAW1394_DEVICE_NAME);
> hpsb_unregister_highlevel(&raw1394_highlevel);
> @@ -2958,4 +2958,4 @@ static void __exit cleanup_raw1394(void)
> module_init(init_raw1394);
> module_exit(cleanup_raw1394);
> MODULE_LICENSE("GPL");
> -MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16);
> +MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394);
> --- linux-2.6.13/drivers/ieee1394/video1394.c~ 2005-09-29 03:51:59.000000000 -0400
> +++ linux-2.6.13/drivers/ieee1394/video1394.c 2005-09-29 03:52:10.000000000 -0400
> @@ -1369,7 +1369,7 @@ static void video1394_add_host (struct h
> hpsb_set_hostinfo(&video1394_highlevel, host, ohci);
> hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id);
>
> - minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id;
> + minor = IEEE1394_MINOR_BLOCK_VIDEO1394 + ohci->host->id;
> class_device_create(hpsb_protocol_class, MKDEV(
> IEEE1394_MAJOR, minor),
> NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
> @@ -1385,7 +1385,7 @@ static void video1394_remove_host (struc
>
> if (ohci) {
> class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
> - IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id));
> + IEEE1394_MINOR_BLOCK_VIDEO1394 + ohci->host->id));
> devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
> }
>
> @@ -1571,4 +1571,4 @@ static int __init video1394_init_module
>
> module_init(video1394_init_module);
> module_exit(video1394_exit_module);
> -MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16);
> +MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394);
> --- linux-2.6.13/drivers/ieee1394/ieee1394_core.h~ 2005-09-29 03:52:20.000000000 -0400
> +++ linux-2.6.13/drivers/ieee1394/ieee1394_core.h 2005-09-29 03:53:14.000000000 -0400
> @@ -200,17 +200,17 @@ void hpsb_packet_received(struct hpsb_ho
> #define IEEE1394_MAJOR 171
>
> #define IEEE1394_MINOR_BLOCK_RAW1394 0
> -#define IEEE1394_MINOR_BLOCK_VIDEO1394 1
> -#define IEEE1394_MINOR_BLOCK_DV1394 2
> -#define IEEE1394_MINOR_BLOCK_AMDTP 3
> +#define IEEE1394_MINOR_BLOCK_VIDEO1394 (1*16)
> +#define IEEE1394_MINOR_BLOCK_DV1394 (2*16)
> +#define IEEE1394_MINOR_BLOCK_AMDTP (3*16)
> #define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15
>
> #define IEEE1394_CORE_DEV MKDEV(IEEE1394_MAJOR, 0)
> -#define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)
> -#define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16)
> -#define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16)
> -#define IEEE1394_AMDTP_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16)
> -#define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16)
> +#define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394)
> +#define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394)
> +#define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394)
> +#define IEEE1394_AMDTP_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP)
> +#define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL)
>
> /* return the index (within a minor number block) of a file */
> static inline unsigned char ieee1394_file_to_instance(struct file *file)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fix broken module aliases in ieee1394
2005-09-29 19:10 ` Andrew Morton
@ 2005-09-29 19:51 ` Jody McIntyre
2005-09-29 20:36 ` Stefan Richter
1 sibling, 0 replies; 4+ messages in thread
From: Jody McIntyre @ 2005-09-29 19:51 UTC (permalink / raw)
To: Andrew Morton; +Cc: Dave Jones, linux-kernel, linux1394-devel
On Thu, Sep 29, 2005 at 12:10:38PM -0700, Andrew Morton wrote:
> hm. There are a bunch of 1394 patches in -mm which appear to remove
> most/all of this stuff.
Stefan's patch (attached) just removes those aliases, but that's fine
since they've never worked.
> So what-the-heck I think I'll send those patches on to Linus today. Please
> review the result and send any remaining fixups on to Linus for 2.6.14.
> (I'm offline for ~10 days, starting tomorrow).
You could just push that patch. It applies fine on its own. It would
be really nice to see the rest of them in 2.6.14 though since they
contain some much-needed sbp2 fixes, among other things.
Jody
Subject: ieee1394: delete legacy module aliases
amdtp, dv1394, raw1394, video1394:
Delete legacy module aliases. The macros did not work and the aliases are not
needed nowadays.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@debian.org>
Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Index: linux-2.6.13/drivers/ieee1394/amdtp.c
===================================================================
--- linux-2.6.13.orig/drivers/ieee1394/amdtp.c
+++ linux-2.6.13/drivers/ieee1394/amdtp.c
@@ -1297,4 +1297,3 @@ static void __exit amdtp_exit_module (vo
module_init(amdtp_init_module);
module_exit(amdtp_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16);
Index: linux-2.6.13/drivers/ieee1394/dv1394.c
===================================================================
--- linux-2.6.13.orig/drivers/ieee1394/dv1394.c
+++ linux-2.6.13/drivers/ieee1394/dv1394.c
@@ -2660,4 +2660,3 @@ static int __init dv1394_init_module(voi
module_init(dv1394_init_module);
module_exit(dv1394_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16);
Index: linux-2.6.13/drivers/ieee1394/raw1394.c
===================================================================
--- linux-2.6.13.orig/drivers/ieee1394/raw1394.c
+++ linux-2.6.13/drivers/ieee1394/raw1394.c
@@ -2958,4 +2958,3 @@ static void __exit cleanup_raw1394(void)
module_init(init_raw1394);
module_exit(cleanup_raw1394);
MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16);
Index: linux-2.6.13/drivers/ieee1394/video1394.c
===================================================================
--- linux-2.6.13.orig/drivers/ieee1394/video1394.c
+++ linux-2.6.13/drivers/ieee1394/video1394.c
@@ -1571,4 +1571,3 @@ static int __init video1394_init_module
module_init(video1394_init_module);
module_exit(video1394_exit_module);
-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fix broken module aliases in ieee1394
2005-09-29 19:10 ` Andrew Morton
2005-09-29 19:51 ` Jody McIntyre
@ 2005-09-29 20:36 ` Stefan Richter
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Richter @ 2005-09-29 20:36 UTC (permalink / raw)
To: Andrew Morton; +Cc: Dave Jones, linux-kernel, linux1394-devel, Jody McIntyre
Andrew Morton wrote:
> Dave Jones <davej@redhat.com> wrote:
>>https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=134047
This bug has been reported in 12/2004 (shame on us) at
http://bugzilla.kernel.org/show_bug.cgi?id=3966
>>The ieee1394 drivers have buggered module aliases.
>>
>>alias: char-major-171-0 * 16
>>
>>This is because MODULE_ALIAS_CHARDEV stringifies its arguments.
>
> hm. There are a bunch of 1394 patches in -mm which appear to remove
> most/all of this stuff.
Yes, that is the plan. These module aliases have been unnecessary for
some time.
> So what-the-heck I think I'll send those patches on to Linus today. Please
> review the result and send any remaining fixups on to Linus for 2.6.14.
> (I'm offline for ~10 days, starting tomorrow).
>
>
>
>>--- linux-2.6.13/drivers/ieee1394/amdtp.c~ 2005-09-29 03:50:20.000000000 -0400
>>+++ linux-2.6.13/drivers/ieee1394/amdtp.c 2005-09-29 03:50:54.000000000 -0400
>>@@ -1234,7 +1234,7 @@ static void amdtp_add_host(struct hpsb_h
>>
>> hpsb_set_hostinfo_key(&amdtp_highlevel, host, ah->host->id);
>>
>>- minor = IEEE1394_MINOR_BLOCK_AMDTP * 16 + ah->host->id;
>>+ minor = IEEE1394_MINOR_BLOCK_AMDTP + ah->host->id;
>>
>> INIT_LIST_HEAD(&ah->stream_list);
>> spin_lock_init(&ah->stream_list_lock);
>>@@ -1297,4 +1297,4 @@ static void __exit amdtp_exit_module (vo
>>
>> module_init(amdtp_init_module);
>> module_exit(amdtp_exit_module);
>>-MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16);
>>+MODULE_ALIAS_CHARDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP);
[...same for the other 1394 hi-level drivers]
This not a correct fix as far as I can see. Each of these drivers has a
block of minor numbers assigned, and we would need to create aliases for
all of the numbers in the blocks --- if we wanted these aliases badly.
Brief discussion in August:
http://marc.theaimsgroup.com/?l=linux1394-devel&t=112341382400002
--
Stefan Richter
-=====-=-=-= =--= ===-=
http://arcgraph.de/sr/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-09-29 20:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-29 18:57 Fix broken module aliases in ieee1394 Dave Jones
2005-09-29 19:10 ` Andrew Morton
2005-09-29 19:51 ` Jody McIntyre
2005-09-29 20:36 ` Stefan Richter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox