diff options
5 files changed, 24 insertions, 24 deletions
diff --git a/driver-core/device-create-s390-convert-device_create-to-device_create_drvdata.patch b/driver-core/device-create-s390-convert-device_create-to-device_create_drvdata.patch index 506a07e5988cd6..0d331cdbf6ceec 100644 --- a/driver-core/device-create-s390-convert-device_create-to-device_create_drvdata.patch +++ b/driver-core/device-create-s390-convert-device_create-to-device_create_drvdata.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c -@@ -1179,17 +1179,19 @@ static int raw3270_create_attributes(str +@@ -1178,17 +1178,19 @@ static int raw3270_create_attributes(str if (rc) goto out; diff --git a/driver-core/rt2x00-treat-firmware-data-as-const.patch b/driver-core/rt2x00-treat-firmware-data-as-const.patch index 1bbcc0b9ec0320..7cfab90be544bb 100644 --- a/driver-core/rt2x00-treat-firmware-data-as-const.patch +++ b/driver-core/rt2x00-treat-firmware-data-as-const.patch @@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -506,8 +506,8 @@ struct rt2x00lib_ops { +@@ -511,8 +511,8 @@ struct rt2x00lib_ops { */ int (*probe_hw) (struct rt2x00_dev *rt2x00dev); char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev); diff --git a/driver-core/s390-bus_id-dev_name-conversions.patch b/driver-core/s390-bus_id-dev_name-conversions.patch index 462a61f11753c8..7c338236145a65 100644 --- a/driver-core/s390-bus_id-dev_name-conversions.patch +++ b/driver-core/s390-bus_id-dev_name-conversions.patch @@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> erp->startdev = cqr->block->base; --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c -@@ -214,7 +214,7 @@ static int dasd_state_known_to_basic(str +@@ -215,7 +215,7 @@ static int dasd_state_known_to_basic(str return rc; } /* register 'device' debug area, used for all DBF_DEV_XXX calls */ @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 8 * sizeof(long)); debug_register_view(device->debug_area, &debug_sprintf_view); debug_set_level(device->debug_area, DBF_WARNING); -@@ -932,7 +932,7 @@ static void dasd_handle_killed_request(s +@@ -933,7 +933,7 @@ static void dasd_handle_killed_request(s MESSAGE(KERN_DEBUG, "invalid status in handle_killed_request: " "bus_id %s, status %02x", @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -941,7 +941,7 @@ static void dasd_handle_killed_request(s +@@ -942,7 +942,7 @@ static void dasd_handle_killed_request(s device != dasd_device_from_cdev_locked(cdev) || strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) { MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s", @@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -981,11 +981,11 @@ void dasd_int_handler(struct ccw_device +@@ -982,11 +982,11 @@ void dasd_int_handler(struct ccw_device break; case -ETIMEDOUT: printk(KERN_WARNING"%s(%s): request timed out\n", @@ -99,7 +99,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } dasd_handle_killed_request(cdev, intparm); return; -@@ -994,7 +994,7 @@ void dasd_int_handler(struct ccw_device +@@ -995,7 +995,7 @@ void dasd_int_handler(struct ccw_device now = get_clock(); DBF_EVENT(DBF_ERR, "Interrupt: bus_id %s CS/DS %04x ip %08x", @@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (unsigned int) intparm); /* check for unsolicited interrupts */ -@@ -1018,7 +1018,7 @@ void dasd_int_handler(struct ccw_device +@@ -1019,7 +1019,7 @@ void dasd_int_handler(struct ccw_device if (!device || strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) { MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s", @@ -117,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -1036,7 +1036,7 @@ void dasd_int_handler(struct ccw_device +@@ -1037,7 +1037,7 @@ void dasd_int_handler(struct ccw_device if (cqr->status != DASD_CQR_IN_IO) { MESSAGE(KERN_DEBUG, "invalid status: bus_id %s, status %02x", @@ -126,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } DBF_DEV_EVENT(DBF_DEBUG, device, "Int: CS/DS 0x%04x for cqr %p", -@@ -2135,14 +2135,14 @@ int dasd_generic_probe(struct ccw_device +@@ -2134,14 +2134,14 @@ int dasd_generic_probe(struct ccw_device if (ret) { printk(KERN_WARNING "dasd_generic_probe: could not set ccw-device options " @@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; } cdev->handler = &dasd_int_handler; -@@ -2153,13 +2153,13 @@ int dasd_generic_probe(struct ccw_device +@@ -2152,13 +2152,13 @@ int dasd_generic_probe(struct ccw_device * initial probe. */ if ((dasd_get_feature(cdev, DASD_FEATURE_INITIAL_ONLINE) > 0 ) || @@ -159,7 +159,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -2225,7 +2225,7 @@ int dasd_generic_set_online(struct ccw_d +@@ -2224,7 +2224,7 @@ int dasd_generic_set_online(struct ccw_d printk (KERN_WARNING "dasd_generic couldn't online device %s " "- discipline DIAG not available\n", @@ -168,7 +168,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dasd_delete_device(device); return -ENODEV; } -@@ -2249,7 +2249,7 @@ int dasd_generic_set_online(struct ccw_d +@@ -2248,7 +2248,7 @@ int dasd_generic_set_online(struct ccw_d printk (KERN_WARNING "dasd_generic couldn't online device %s " "with discipline %s rc=%i\n", @@ -177,7 +177,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> module_put(discipline->owner); module_put(base_discipline->owner); dasd_delete_device(device); -@@ -2260,7 +2260,7 @@ int dasd_generic_set_online(struct ccw_d +@@ -2259,7 +2259,7 @@ int dasd_generic_set_online(struct ccw_d if (device->state <= DASD_STATE_KNOWN) { printk (KERN_WARNING "dasd_generic discipline not found for %s\n", @@ -186,7 +186,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> rc = -ENODEV; dasd_set_target_state(device, DASD_STATE_NEW); if (device->block) -@@ -2268,7 +2268,7 @@ int dasd_generic_set_online(struct ccw_d +@@ -2267,7 +2267,7 @@ int dasd_generic_set_online(struct ccw_d dasd_delete_device(device); } else pr_debug("dasd_generic device %s found\n", @@ -875,7 +875,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> spin_unlock_irq(get_ccwdev_lock(device->cdev)); return -EBUSY; } -@@ -537,7 +537,7 @@ tape_generic_probe(struct ccw_device *cd +@@ -538,7 +538,7 @@ tape_generic_probe(struct ccw_device *cd ret = sysfs_create_group(&cdev->dev.kobj, &tape_attr_group); if (ret) { tape_put_device(device); @@ -884,7 +884,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; } cdev->dev.driver_data = device; -@@ -545,7 +545,7 @@ tape_generic_probe(struct ccw_device *cd +@@ -546,7 +546,7 @@ tape_generic_probe(struct ccw_device *cd device->cdev = cdev; ccw_device_get_id(cdev, &dev_id); device->cdev_id = devid_to_int(&dev_id); @@ -893,7 +893,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; } -@@ -615,7 +615,7 @@ tape_generic_remove(struct ccw_device *c +@@ -616,7 +616,7 @@ tape_generic_remove(struct ccw_device *c device->cdev_id); PRINT_WARN("(%s): Drive in use vanished - " "expect trouble!\n", @@ -902,7 +902,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> PRINT_WARN("State was %i\n", device->tape_state); tape_state_set(device, TS_NOT_OPER); __tape_discard_requests(device); -@@ -839,7 +839,7 @@ tape_dump_sense(struct tape_device* devi +@@ -840,7 +840,7 @@ tape_dump_sense(struct tape_device* devi PRINT_INFO("-------------------------------------------------\n"); PRINT_INFO("DSTAT : %02x CSTAT: %02x CPA: %04x\n", irb->scsw.dstat, irb->scsw.cstat, irb->scsw.cpa); @@ -911,7 +911,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (request != NULL) PRINT_INFO("OP : %s\n", tape_op_verbose[request->op]); -@@ -1053,7 +1053,7 @@ __tape_do_irq (struct ccw_device *cdev, +@@ -1051,7 +1051,7 @@ __tape_do_irq (struct ccw_device *cdev, device = (struct tape_device *) cdev->dev.driver_data; if (device == NULL) { PRINT_ERR("could not get device structure for %s " @@ -920,7 +920,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } request = (struct tape_request *) intparm; -@@ -1066,13 +1066,13 @@ __tape_do_irq (struct ccw_device *cdev, +@@ -1064,13 +1064,13 @@ __tape_do_irq (struct ccw_device *cdev, switch (PTR_ERR(irb)) { case -ETIMEDOUT: PRINT_WARN("(%s): Request timed out\n", diff --git a/driver-core/s390-more-bus_id-dev_name-conversions.patch b/driver-core/s390-more-bus_id-dev_name-conversions.patch index 39ed0a30281381..12b42e2f4aff4e 100644 --- a/driver-core/s390-more-bus_id-dev_name-conversions.patch +++ b/driver-core/s390-more-bus_id-dev_name-conversions.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c -@@ -1182,7 +1182,7 @@ static int raw3270_create_attributes(str +@@ -1181,7 +1181,7 @@ static int raw3270_create_attributes(str rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev, MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL, @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (IS_ERR(rp->clttydev)) { rc = PTR_ERR(rp->clttydev); goto out_ttydev; -@@ -1191,7 +1191,7 @@ static int raw3270_create_attributes(str +@@ -1190,7 +1190,7 @@ static int raw3270_create_attributes(str rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev, MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL, @@ -1 +1 @@ -2.6.26-rc4-git3 +2.6.26-rc4-git4 |