[Linux1394-cvslog] rev 852 - trunk
Brought to you by:
aeb,
bencollins
From: SVN U. <ben...@li...> - 2003-04-03 15:19:49
|
Author: bencollins Date: 2003-04-03 10:19:11 -0500 (Thu, 03 Apr 2003) New Revision: 852 Modified: trunk/dv1394.c trunk/ieee1394_core.c trunk/video1394.c Log: Update devfs_mk_dir usage. Patch merged from 2.5.66. Modified: trunk/ieee1394_core.c ============================================================================== --- trunk/ieee1394_core.c (original) +++ trunk/ieee1394_core.c 2003-04-03 10:19:13.000000000 -0500 @@ -1152,7 +1152,7 @@ hpsb_packet_cache = kmem_cache_create("hpsb_packet", sizeof(struct hpsb_packet), 0, 0, NULL, NULL); - ieee1394_devfs_handle = devfs_mk_dir(NULL, "ieee1394", NULL); + ieee1394_devfs_handle = devfs_mk_dir("ieee1394"); if (register_chrdev(IEEE1394_MAJOR, "ieee1394", &ieee1394_chardev_ops)) { HPSB_ERR("unable to register character device major %d!\n", IEEE1394_MAJOR); Modified: trunk/video1394.c ============================================================================== --- trunk/video1394.c (original) +++ trunk/video1394.c 2003-04-03 10:19:13.000000000 -0500 @@ -1251,7 +1251,7 @@ { struct video_card *video; unsigned long flags; - char name[16]; + char name[24]; int minor; video = kmalloc(sizeof(struct video_card), GFP_KERNEL); @@ -1270,9 +1270,9 @@ video->id = ohci->id; video->ohci = ohci; - sprintf(name, "%d", video->id); + sprintf(name, "%s/%d", VIDEO1394_DRIVER_NAME, video->id); minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + video->id; - video->devfs = devfs_register(devfs_handle, name, DEVFS_FL_DEFAULT, + video->devfs = devfs_register(NULL, name, DEVFS_FL_DEFAULT, IEEE1394_MAJOR, minor, S_IFCHR | S_IRUSR | S_IWUSR, &video1394_fops, NULL); @@ -1486,7 +1486,7 @@ return -EIO; } - devfs_handle = devfs_mk_dir(NULL, VIDEO1394_DRIVER_NAME, NULL); + devfs_handle = devfs_mk_dir(VIDEO1394_DRIVER_NAME); hl_handle = hpsb_register_highlevel (VIDEO1394_DRIVER_NAME, &hl_ops); if (hl_handle == NULL) { Modified: trunk/dv1394.c ============================================================================== --- trunk/dv1394.c (original) +++ trunk/dv1394.c 2003-04-03 10:19:13.000000000 -0500 @@ -2648,12 +2648,9 @@ #endif #ifdef CONFIG_DEVFS_FS - snprintf(buf, sizeof(buf), "ieee1394/dv/host%d", ohci->id); - devfs_mk_dir(NULL, buf, NULL); - snprintf(buf, sizeof(buf), "ieee1394/dv/host%d/NTSC", ohci->id); - devfs_mk_dir(NULL, buf, NULL); - snprintf(buf, sizeof(buf), "ieee1394/dv/host%d/PAL", ohci->id); - devfs_mk_dir(NULL, buf, NULL); + devfs_mk_dir("ieee1394/dv/host%d", ohci->id); + devfs_mk_dir("ieee1394/dv/host%d/NTSC", ohci->id); + devfs_mk_dir("ieee1394/dv/host%d/PAL", ohci->id); #endif dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE); |