diff options
10 files changed, 29 insertions, 29 deletions
diff --git a/driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch index 15daa0b05548b5..d4d7bef4a43dc8 100644 --- a/driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto put_dev; --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c -@@ -277,9 +277,9 @@ aoechr_init(void) +@@ -278,9 +278,9 @@ aoechr_init(void) return PTR_ERR(aoe_class); } for (i = 0; i < ARRAY_SIZE(chardevs); ++i) diff --git a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch index 51539092738b93..80200a621e7182 100644 --- a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> cur->bsr_name); --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c -@@ -500,8 +500,8 @@ static int __init dsp56k_init_driver(voi +@@ -508,8 +508,8 @@ static int __init dsp56k_init_driver(voi err = PTR_ERR(dsp56k_class); goto out_chrdev; } @@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven"); --- a/drivers/char/mem.c +++ b/drivers/char/mem.c -@@ -989,9 +989,9 @@ static int __init chr_dev_init(void) +@@ -992,9 +992,9 @@ static int __init chr_dev_init(void) mem_class = class_create(THIS_MODULE, "mem"); for (i = 0; i < ARRAY_SIZE(devlist); i++) @@ -172,7 +172,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c -@@ -752,9 +752,8 @@ static const struct file_operations pp_f +@@ -760,9 +760,8 @@ static const struct file_operations pp_f static void pp_attach(struct parport *port) { @@ -222,7 +222,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 0 /*ignored */ , --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c -@@ -4755,8 +4755,8 @@ static int __init stallion_module_init(v +@@ -4754,8 +4754,8 @@ static int __init stallion_module_init(v if (IS_ERR(stallion_class)) printk("STALLION: failed to create class\n"); for (i = 0; i < 4; i++) @@ -235,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> err_unrtty: --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c -@@ -3412,7 +3412,7 @@ struct device *tty_register_device(struc +@@ -3399,7 +3399,7 @@ struct device *tty_register_device(struc else tty_line_name(driver, index, name); @@ -244,7 +244,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -3690,22 +3690,20 @@ static int __init tty_init(void) +@@ -3676,22 +3676,20 @@ static int __init tty_init(void) if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) panic("Couldn't register /dev/tty driver\n"); @@ -270,7 +270,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif #ifdef CONFIG_VT -@@ -3713,7 +3711,7 @@ static int __init tty_init(void) +@@ -3699,7 +3697,7 @@ static int __init tty_init(void) if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) panic("Couldn't register /dev/tty0 driver\n"); @@ -355,7 +355,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> printk(KERN_WARNING "Unable to create " --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c -@@ -659,8 +659,7 @@ static int __devinit hwicap_setup(struct +@@ -658,8 +658,7 @@ static int __devinit hwicap_setup(struct goto failed3; } diff --git a/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch index 131088e75e7eca..a7933ed8400da6 100644 --- a/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c -@@ -648,8 +648,8 @@ static int ide_register_port(ide_hwif_t +@@ -660,8 +660,8 @@ static int ide_register_port(ide_hwif_t goto out; } @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> device_unregister(&hwif->gendev); --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c -@@ -2697,12 +2697,11 @@ static int ide_tape_probe(ide_drive_t *d +@@ -2686,12 +2686,11 @@ static int ide_tape_probe(ide_drive_t *d idetape_setup(drive, tape, minor); diff --git a/driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch index 71fae083626fd6..84a2f892beb4a3 100644 --- a/driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch @@ -85,19 +85,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/dca/dca-sysfs.c +++ b/drivers/dca/dca-sysfs.c -@@ -14,9 +14,8 @@ int dca_sysfs_add_req(struct dca_provide - { +@@ -15,9 +15,8 @@ int dca_sysfs_add_req(struct dca_provide struct device *cd; + static int req_count; - cd = device_create_drvdata(dca_class, dca->cd, - MKDEV(0, slot + 1), NULL, -- "requester%d", slot); +- "requester%d", req_count++); + cd = device_create(dca_class, dca->cd, MKDEV(0, slot + 1), NULL, -+ "requester%d", slot); ++ "requester%d", req_count++); if (IS_ERR(cd)) return PTR_ERR(cd); return 0; -@@ -47,8 +46,7 @@ idr_try_again: +@@ -48,8 +47,7 @@ idr_try_again: return err; } @@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> idr_remove(&dca_idr, dca->id); --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c -@@ -322,9 +322,8 @@ int hidraw_connect(struct hid_device *hi +@@ -326,9 +326,8 @@ int hidraw_connect(struct hid_device *hi goto out; } @@ -214,7 +214,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_set_drvdata(pdev, pht); --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c -@@ -28,13 +28,11 @@ static void mtd_notify_add(struct mtd_in +@@ -26,13 +26,11 @@ static void mtd_notify_add(struct mtd_in if (!mtd) return; @@ -248,7 +248,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto dev_create_failed; --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -576,10 +576,9 @@ static int spidev_probe(struct spi_devic +@@ -583,10 +583,9 @@ static int spidev_probe(struct spi_devic struct device *dev; spidev->devt = MKDEV(SPIDEV_MAJOR, minor); diff --git a/driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch index ff876cb0c648f4..45bbc2e4c6a857 100644 --- a/driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> "device_create failed\n"); --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c -@@ -4431,13 +4431,10 @@ static int do_create_class_files(struct +@@ -4428,13 +4428,10 @@ static int do_create_class_files(struct snprintf(name, 10, "%s%s%s", rew ? "n" : "", STp->disk->disk_name, st_formats[i]); st_class_member = diff --git a/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch index b74ffbf12f0789..986c206c9b9968 100644 --- a/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c -@@ -3586,8 +3586,8 @@ static int __init fb_console_init(void) +@@ -3585,8 +3585,8 @@ static int __init fb_console_init(void) acquire_console_sem(); fb_register_client(&fbcon_event_notifier); @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> new_dev->driver = driver; --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c -@@ -1439,9 +1439,8 @@ register_framebuffer(struct fb_info *fb_ +@@ -1438,9 +1438,8 @@ register_framebuffer(struct fb_info *fb_ break; fb_info->node = i; diff --git a/driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch b/driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch index c1f8f2e22016a9..f22a631e2e412b 100644 --- a/driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch +++ b/driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> incorrect and needs to be fixed. --- a/drivers/base/core.c +++ b/drivers/base/core.c -@@ -1307,6 +1307,11 @@ EXPORT_SYMBOL_GPL(device_destroy); +@@ -1305,6 +1305,11 @@ EXPORT_SYMBOL_GPL(device_destroy); * device_rename - renames a device * @dev: the pointer to the struct device to be renamed * @new_name: the new name of the device @@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static inline int sysfs_move_dir(struct kobject *kobj, --- a/lib/kobject.c +++ b/lib/kobject.c -@@ -389,6 +389,11 @@ EXPORT_SYMBOL_GPL(kobject_init_and_add); +@@ -388,6 +388,11 @@ EXPORT_SYMBOL_GPL(kobject_init_and_add); * kobject_rename - change the name of an object * @kobj: object in question. * @new_name: object's new name @@ -113,7 +113,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ int kobject_rename(struct kobject *kobj, const char *new_name) { -@@ -403,19 +408,6 @@ int kobject_rename(struct kobject *kobj, +@@ -402,19 +407,6 @@ int kobject_rename(struct kobject *kobj, if (!kobj->parent) return -EINVAL; diff --git a/driver-core/put_device-might_sleep.patch b/driver-core/put_device-might_sleep.patch index 3ad76edba6e07b..d8f9a529f6e5b0 100644 --- a/driver-core/put_device-might_sleep.patch +++ b/driver-core/put_device-might_sleep.patch @@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/base/core.c +++ b/drivers/base/core.c -@@ -469,6 +469,7 @@ EXPORT_SYMBOL_GPL(device_create_bin_file +@@ -467,6 +467,7 @@ EXPORT_SYMBOL_GPL(device_create_bin_file */ void device_remove_bin_file(struct device *dev, struct bin_attribute *attr) { diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch index d7f1459d6bbb01..a1bed4f42b7d14 100644 --- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -795,12 +795,21 @@ static void run_init_process(char *init_ +@@ -788,12 +788,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } @@ -129,7 +129,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * populate_dir - populate directory with attributes. -@@ -284,6 +335,7 @@ void kobject_init(struct kobject *kobj, +@@ -283,6 +334,7 @@ void kobject_init(struct kobject *kobj, "object, something is seriously wrong.\n", kobj); dump_stack(); } @@ -1 +1 @@ -2.6.26-git10 +2.6.27-rc1 |