diff options
13 files changed, 33 insertions, 55 deletions
diff --git a/driver-core/bt8xx-treat-firmware-data-as-const.patch b/driver-core/bt8xx-treat-firmware-data-as-const.patch index 36502bff17bd62..0807a433423b82 100644 --- a/driver-core/bt8xx-treat-firmware-data-as-const.patch +++ b/driver-core/bt8xx-treat-firmware-data-as-const.patch @@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c -@@ -3767,7 +3767,8 @@ static int terratec_active_radio_upgrade +@@ -3768,7 +3768,8 @@ static int terratec_active_radio_upgrade #define BTTV_ALT_DCLK 0x100000 #define BTTV_ALT_NCONFIG 0x800000 diff --git a/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch b/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch index 1539d830457e52..28fd456aca682e 100644 --- a/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch +++ b/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch @@ -307,7 +307,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> i, viotape_unitinfo[i].rsrcname, --- a/drivers/char/vt.c +++ b/drivers/char/vt.c -@@ -3422,9 +3422,10 @@ int register_con_driver(const struct con +@@ -3425,9 +3425,10 @@ int register_con_driver(const struct con if (retval) goto err; @@ -321,7 +321,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (IS_ERR(con_driver->dev)) { printk(KERN_WARNING "Unable to create device for %s; " -@@ -3532,9 +3533,10 @@ static int __init vtconsole_class_init(v +@@ -3535,9 +3536,10 @@ static int __init vtconsole_class_init(v struct con_driver *con = ®istered_con_driver[i]; if (con->con && !con->dev) { diff --git a/driver-core/device-create-framebuffer-convert-device_create-to-device_create_drvdata.patch b/driver-core/device-create-framebuffer-convert-device_create-to-device_create_drvdata.patch index 93265d45db8c19..ea71708ee186c2 100644 --- a/driver-core/device-create-framebuffer-convert-device_create-to-device_create_drvdata.patch +++ b/driver-core/device-create-framebuffer-convert-device_create-to-device_create_drvdata.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 -@@ -3588,7 +3588,8 @@ static int __init fb_console_init(void) +@@ -3586,7 +3586,8 @@ static int __init fb_console_init(void) acquire_console_sem(); fb_register_client(&fbcon_event_notifier); diff --git a/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch b/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch index fd4e2536fed0f8..25eae207a9f552 100644 --- a/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch +++ b/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch @@ -65,7 +65,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/scsi/scsi_transport_srp.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/spi/spi.c | 8 +++----- - drivers/spi/spidev.c | 3 +-- drivers/ssb/main.c | 3 +-- drivers/thermal/thermal_sys.c | 4 ++-- drivers/usb/core/endpoint.c | 2 +- @@ -92,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/video/backlight/lcd.c | 2 +- drivers/video/output.c | 2 +- drivers/virtio/virtio.c | 2 +- - drivers/virtio/virtio_pci.c | 4 ++-- + drivers/virtio/virtio_pci.c | 2 +- drivers/w1/w1.c | 7 +++---- drivers/w1/w1_int.c | 3 +-- fs/partitions/check.c | 12 ++++++------ @@ -102,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> net/rfkill/rfkill.c | 4 ++-- net/wireless/core.c | 3 +-- sound/pci/ac97/ac97_codec.c | 2 +- - 93 files changed, 157 insertions(+), 200 deletions(-) + 92 files changed, 155 insertions(+), 197 deletions(-) --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -897,7 +896,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c -@@ -1065,16 +1065,14 @@ void scsi_sysfs_device_initialize(struct +@@ -1070,16 +1070,14 @@ void scsi_sysfs_device_initialize(struct device_initialize(&sdev->sdev_gendev); sdev->sdev_gendev.bus = &scsi_bus_type; sdev->sdev_gendev.type = &scsi_dev_type; @@ -1066,18 +1065,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> status = device_add(&master->dev); if (status < 0) goto done; ---- a/drivers/spi/spidev.c -+++ b/drivers/spi/spidev.c -@@ -573,8 +573,7 @@ static int spidev_probe(struct spi_devic - spidev->dev.parent = &spi->dev; - spidev->dev.class = &spidev_class; - spidev->dev.devt = MKDEV(SPIDEV_MAJOR, minor); -- snprintf(spidev->dev.bus_id, sizeof spidev->dev.bus_id, -- "spidev%d.%d", -+ dev_set_name(&spidev->dev, "spidev%d.%d", - spi->master->bus_num, spi->chip_select); - status = device_register(&spidev->dev); - } else { --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -454,8 +454,7 @@ static int ssb_devices_register(struct s @@ -1395,12 +1382,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (ret_code) { --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c -@@ -166,7 +166,7 @@ int register_virtio_device(struct virtio - int err; +@@ -172,7 +172,7 @@ int register_virtio_device(struct virtio - dev->dev.bus = &virtio_bus; -- sprintf(dev->dev.bus_id, "%u", dev->index); -+ dev_set_name(&dev->dev, "%u", dev->index); + /* Assign a unique device index and hence name. */ + dev->index = dev_index++; +- sprintf(dev->dev.bus_id, "virtio%u", dev->index); ++ dev_set_name(&dev->dev, "virtio%u", dev->index); /* We always start by resetting the device, in case a previous * driver messed it up. This also tests that code path a little. */ @@ -1414,16 +1401,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + .init_name = "virtio-pci", }; - /* Unique numbering for devices under the kvm root */ -@@ -325,7 +325,7 @@ static int __devinit virtio_pci_probe(st - if (vp_dev == NULL) - return -ENOMEM; - -- snprintf(vp_dev->vdev.dev.bus_id, BUS_ID_SIZE, "virtio%d", dev_index); -+ dev_set_name(&vp_dev->vdev.dev, "virtio%d", dev_index); - vp_dev->vdev.index = dev_index; - dev_index++; - + /* Convert a generic virtio device to our structure */ --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -214,7 +214,7 @@ struct device_driver w1_master_driver = diff --git a/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch b/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch index 750f3668f93443..6f22767ef9114f 100644 --- a/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch +++ b/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch @@ -155,7 +155,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c -@@ -197,9 +197,7 @@ static void iommu_full(struct device *de +@@ -198,9 +198,7 @@ static void iommu_full(struct device *de * out. Hopefully no network devices use single mappings that big. */ diff --git a/driver-core/driver-core-lguest-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch b/driver-core/driver-core-lguest-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch index 8a58b5b3ec96b3..b9521ba5f78809 100644 --- a/driver-core/driver-core-lguest-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch +++ b/driver-core/driver-core-lguest-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch @@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/lguest/lguest_device.c +++ b/drivers/lguest/lguest_device.c -@@ -314,7 +314,7 @@ static struct virtio_config_ops lguest_c +@@ -311,7 +311,7 @@ static struct virtio_config_ops lguest_c * /sys/devices/lguest/0,1,2 not /sys/devices/0,1,2. */ static struct device lguest_root = { .parent = NULL, diff --git a/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch b/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch index bbcd3cb0ababf8..5152db7e2ffc72 100644 --- a/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch +++ b/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch @@ -585,7 +585,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> get_device(dev); --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c -@@ -3189,7 +3189,7 @@ static void ata_scsi_remove_dev(struct a +@@ -3190,7 +3190,7 @@ static void ata_scsi_remove_dev(struct a if (sdev) { ata_dev_printk(dev, KERN_INFO, "detaching (SCSI %s)\n", @@ -1332,7 +1332,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> input_dev->phys = ts->phys; --- a/drivers/lguest/lguest_device.c +++ b/drivers/lguest/lguest_device.c -@@ -263,7 +263,7 @@ static struct virtqueue *lg_find_vq(stru +@@ -260,7 +260,7 @@ static struct virtqueue *lg_find_vq(stru * the interrupt as a source of randomness: it'd be nice to have that * back.. */ err = request_irq(lvq->config.irq, vring_interrupt, IRQF_SHARED, @@ -1827,7 +1827,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (u32)to, len); if (retlen) -@@ -510,7 +510,7 @@ static struct flash_info *__devinit jede +@@ -512,7 +512,7 @@ static struct flash_info *__devinit jede tmp = spi_write_then_read(spi, &code, 1, id, 3); if (tmp < 0) { DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n", @@ -1836,7 +1836,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return NULL; } jedec = id[0]; -@@ -559,7 +559,7 @@ static int __devinit m25p_probe(struct s +@@ -561,7 +561,7 @@ static int __devinit m25p_probe(struct s /* unrecognized chip? */ if (i == ARRAY_SIZE(m25p_data)) { DEBUG(MTD_DEBUG_LEVEL0, "%s: unrecognized id %s\n", @@ -1845,7 +1845,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> info = NULL; /* recognized; is that chip really what's there? */ -@@ -590,7 +590,7 @@ static int __devinit m25p_probe(struct s +@@ -592,7 +592,7 @@ static int __devinit m25p_probe(struct s if (data && data->name) flash->mtd.name = data->name; else @@ -3524,7 +3524,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c -@@ -2031,7 +2031,7 @@ int uart_suspend_port(struct uart_driver +@@ -2040,7 +2040,7 @@ int uart_suspend_port(struct uart_driver if (!tries) printk(KERN_ERR "%s%s%s%d: Unable to drain " "transmitter\n", @@ -3533,7 +3533,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> port->dev ? ": " : "", drv->dev_name, port->line); -@@ -2157,7 +2157,7 @@ uart_report_port(struct uart_driver *drv +@@ -2166,7 +2166,7 @@ uart_report_port(struct uart_driver *drv } printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n", @@ -4513,7 +4513,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> task = kthread_run(ps3fbd, info, DEVICE_NAME); --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c -@@ -359,7 +359,7 @@ static int __devinit virtio_pci_probe(st +@@ -352,7 +352,7 @@ static int __devinit virtio_pci_probe(st /* register a handler for the queue with the PCI device's interrupt */ err = request_irq(vp_dev->pci_dev->irq, vp_interrupt, IRQF_SHARED, diff --git a/driver-core/driver-core-remove-kobj_name_len-define.patch b/driver-core/driver-core-remove-kobj_name_len-define.patch index 360e0322f9886a..9f4cde38b5c338 100644 --- a/driver-core/driver-core-remove-kobj_name_len-define.patch +++ b/driver-core/driver-core-remove-kobj_name_len-define.patch @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> spinlock_t scsi_lookup_lock; --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c -@@ -1328,8 +1328,8 @@ mptfc_probe(struct pci_dev *pdev, const +@@ -1326,8 +1326,8 @@ mptfc_probe(struct pci_dev *pdev, const /* initialize workqueue */ diff --git a/driver-core/p54-treat-firmware-data-as-const.patch b/driver-core/p54-treat-firmware-data-as-const.patch index 7b32694e09aef1..b1d37719d832c2 100644 --- a/driver-core/p54-treat-firmware-data-as-const.patch +++ b/driver-core/p54-treat-firmware-data-as-const.patch @@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c -@@ -375,7 +375,8 @@ static int p54u_upload_firmware_3887(str +@@ -376,7 +376,8 @@ static int p54u_upload_firmware_3887(str const struct firmware *fw_entry = NULL; int err, alen; u8 carry = 0; @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> unsigned int left, remains, block_size; struct x2_header *hdr; unsigned long timeout; -@@ -522,7 +523,7 @@ static int p54u_upload_firmware_net2280( +@@ -523,7 +524,7 @@ static int p54u_upload_firmware_net2280( void *buf; __le32 reg; unsigned int remains, offset; diff --git a/driver-core/s390-use-s390_root_dev_-in-kvm_virtio.patch b/driver-core/s390-use-s390_root_dev_-in-kvm_virtio.patch index 194318fdf34088..7ee2c918bab24c 100644 --- a/driver-core/s390-use-s390_root_dev_-in-kvm_virtio.patch +++ b/driver-core/s390-use-s390_root_dev_-in-kvm_virtio.patch @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define VIRTIO_SUBCODE_64 0x0D00 -@@ -241,10 +242,7 @@ static struct virtio_config_ops kvm_vq_c +@@ -236,10 +237,7 @@ static struct virtio_config_ops kvm_vq_c * The root device for the kvm virtio devices. * This makes them appear as /sys/devices/kvm_s390/0,1,2 not /sys/devices/0,1,2. */ @@ -43,16 +43,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * adds a new device and register it with virtio -@@ -261,7 +259,7 @@ static void add_kvm_device(struct kvm_de +@@ -256,7 +254,7 @@ static void add_kvm_device(struct kvm_de return; } - kdev->vdev.dev.parent = &kvm_root; + kdev->vdev.dev.parent = kvm_root; - kdev->vdev.index = dev_index++; kdev->vdev.id.device = d->type; kdev->vdev.config = &kvm_vq_configspace_ops; -@@ -318,15 +316,16 @@ static int __init kvm_devices_init(void) + kdev->desc = d; +@@ -312,15 +310,16 @@ static int __init kvm_devices_init(void) if (!MACHINE_IS_KVM) return -ENODEV; diff --git a/driver-core/ttusb-dec-treat-firmware-data-as-const.patch b/driver-core/ttusb-dec-treat-firmware-data-as-const.patch index 3789fe3b686d4e..176f35030668a9 100644 --- a/driver-core/ttusb-dec-treat-firmware-data-as-const.patch +++ b/driver-core/ttusb-dec-treat-firmware-data-as-const.patch @@ -20,4 +20,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + const u8 *firmware = NULL; size_t firmware_size = 0; u16 firmware_csum = 0; - u16 firmware_csum_ns; + __be16 firmware_csum_ns; diff --git a/driver-core/tuners-treat-firmware-data-as-const.patch b/driver-core/tuners-treat-firmware-data-as-const.patch index b851929f3d75ea..7afe47c9ee90ce 100644 --- a/driver-core/tuners-treat-firmware-data-as-const.patch +++ b/driver-core/tuners-treat-firmware-data-as-const.patch @@ -13,7 +13,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c -@@ -255,7 +255,7 @@ static int load_all_firmwares(struct dvb +@@ -254,7 +254,7 @@ static int load_all_firmwares(struct dvb { struct xc2028_data *priv = fe->tuner_priv; const struct firmware *fw = NULL; @@ -1 +1 @@ -2.6.26-rc4-git4 +2.6.26-rc5-git2 |