diff options
43 files changed, 131 insertions, 531 deletions
diff --git a/driver-core/bus_id-arm.patch b/driver-core/bus_id-arm.patch index 28b946b379cfcc..221c44d1e64516 100644 --- a/driver-core/bus_id-arm.patch +++ b/driver-core/bus_id-arm.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }, --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c -@@ -389,7 +389,7 @@ static struct amba_pl010_data ep93xx_uar +@@ -409,7 +409,7 @@ static struct amba_pl010_data ep93xx_uar static struct amba_device uart1_device = { .dev = { @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .platform_data = &ep93xx_uart_data, }, .res = { -@@ -403,7 +403,7 @@ static struct amba_device uart1_device = +@@ -423,7 +423,7 @@ static struct amba_device uart1_device = static struct amba_device uart2_device = { .dev = { @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .platform_data = &ep93xx_uart_data, }, .res = { -@@ -417,7 +417,7 @@ static struct amba_device uart2_device = +@@ -437,7 +437,7 @@ static struct amba_device uart2_device = static struct amba_device uart3_device = { .dev = { @@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .res = { --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c -@@ -35,7 +35,7 @@ static struct amba_pl010_data integrator +@@ -37,7 +37,7 @@ static struct amba_pl010_data integrator static struct amba_device rtc_device = { .dev = { @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }, .res = { .start = INTEGRATOR_RTC_BASE, -@@ -48,7 +48,7 @@ static struct amba_device rtc_device = { +@@ -50,7 +50,7 @@ static struct amba_device rtc_device = { static struct amba_device uart0_device = { .dev = { @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .platform_data = &integrator_uart_data, }, .res = { -@@ -62,7 +62,7 @@ static struct amba_device uart0_device = +@@ -64,7 +64,7 @@ static struct amba_device uart0_device = static struct amba_device uart1_device = { .dev = { @@ -97,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .platform_data = &integrator_uart_data, }, .res = { -@@ -76,7 +76,7 @@ static struct amba_device uart1_device = +@@ -78,7 +78,7 @@ static struct amba_device uart1_device = static struct amba_device kmi0_device = { .dev = { @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }, .res = { .start = KMI0_BASE, -@@ -89,7 +89,7 @@ static struct amba_device kmi0_device = +@@ -91,7 +91,7 @@ static struct amba_device kmi0_device = static struct amba_device kmi1_device = { .dev = { @@ -117,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .start = KMI1_BASE, --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c -@@ -405,7 +405,7 @@ static struct mmc_platform_data mmc_data +@@ -407,7 +407,7 @@ static struct mmc_platform_data mmc_data static struct amba_device mmc_device = { .dev = { @@ -126,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .platform_data = &mmc_data, }, .res = { -@@ -419,7 +419,7 @@ static struct amba_device mmc_device = { +@@ -421,7 +421,7 @@ static struct amba_device mmc_device = { static struct amba_device aaci_device = { .dev = { @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }, .res = { .start = INTCP_PA_AACI_BASE, -@@ -530,7 +530,7 @@ static struct clcd_board clcd_data = { +@@ -532,7 +532,7 @@ static struct clcd_board clcd_data = { static struct amba_device clcd_device = { .dev = { @@ -157,7 +157,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .res = { \ --- a/arch/arm/mach-netx/fb.c +++ b/arch/arm/mach-netx/fb.c -@@ -94,7 +94,7 @@ void clk_put(struct clk *clk) +@@ -91,7 +91,7 @@ void clk_put(struct clk *clk) static struct amba_device fb_device = { .dev = { @@ -190,7 +190,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .res = { \ --- a/arch/arm/plat-omap/include/mach/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h -@@ -70,7 +70,7 @@ +@@ -59,7 +59,7 @@ #define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET) #define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET) diff --git a/driver-core/bus_id-block.patch b/driver-core/bus_id-block.patch index 6136372a9c3516..03c8a68dcffe21 100644 --- a/driver-core/bus_id-block.patch +++ b/driver-core/bus_id-block.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * we need a proper transport to send commands, not a stacked device --- a/block/genhd.c +++ b/block/genhd.c -@@ -1069,7 +1069,7 @@ dev_t blk_lookup_devt(const char *name, +@@ -1084,7 +1084,7 @@ dev_t blk_lookup_devt(const char *name, struct gendisk *disk = dev_to_disk(dev); struct hd_struct *part; diff --git a/driver-core/bus_id-gpu.patch b/driver-core/bus_id-gpu.patch index bea86fe60a4276..e2cb89ca4a53ed 100644 --- a/driver-core/bus_id-gpu.patch +++ b/driver-core/bus_id-gpu.patch @@ -10,9 +10,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c -@@ -165,7 +165,7 @@ int drm_sysfs_device_add(struct drm_mino - minor->kdev.devt = minor->device; - minor_str = "card%d"; +@@ -488,7 +488,7 @@ int drm_sysfs_device_add(struct drm_mino + else + minor_str = "card%d"; - snprintf(minor->kdev.bus_id, BUS_ID_SIZE, minor_str, minor->index); + dev_set_name(&minor->kdev, minor_str, minor->index); diff --git a/driver-core/bus_id-infiniband.patch b/driver-core/bus_id-infiniband.patch index 614bff2ce8c3e7..a93b517972b1f8 100644 --- a/driver-core/bus_id-infiniband.patch +++ b/driver-core/bus_id-infiniband.patch @@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c -@@ -786,7 +786,7 @@ int ib_device_register_sysfs(struct ib_d +@@ -778,7 +778,7 @@ int ib_device_register_sysfs(struct ib_d class_dev->class = &ib_class; class_dev->driver_data = device; class_dev->parent = device->dma_device; @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c -@@ -1972,8 +1972,7 @@ static struct srp_host *srp_add_port(str +@@ -1949,8 +1949,7 @@ static struct srp_host *srp_add_port(str host->dev.class = &srp_class; host->dev.parent = device->dev->dma_device; diff --git a/driver-core/bus_id-kernel-power.patch b/driver-core/bus_id-kernel-power.patch index f79c252948fdea..a0d5ff31fcf198 100644 --- a/driver-core/bus_id-kernel-power.patch +++ b/driver-core/bus_id-kernel-power.patch @@ -9,7 +9,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/kernel/power/main.c +++ b/kernel/power/main.c -@@ -618,7 +618,7 @@ static void __init test_wakealarm(struct +@@ -615,7 +615,7 @@ static void __init test_wakealarm(struct /* this may fail if the RTC hasn't been initialized */ status = rtc_read_time(rtc, &alm.time); if (status < 0) { @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } rtc_tm_to_time(&alm.time, &now); -@@ -629,7 +629,7 @@ static void __init test_wakealarm(struct +@@ -626,7 +626,7 @@ static void __init test_wakealarm(struct status = rtc_set_alarm(rtc, &alm); if (status < 0) { @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -663,7 +663,7 @@ static int __init has_wakealarm(struct d +@@ -660,7 +660,7 @@ static int __init has_wakealarm(struct d if (!device_may_wakeup(candidate->dev.parent)) return 0; diff --git a/driver-core/bus_id-powerpc.patch b/driver-core/bus_id-powerpc.patch deleted file mode 100644 index 5f1cd316d0ebd0..00000000000000 --- a/driver-core/bus_id-powerpc.patch +++ /dev/null @@ -1,251 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: powerpc: struct device - replace bus_id with dev_name(), dev_set_name() - -Cc: Paul Mackerras <paulus@samba.org> -Acked-by: Geoff Levand <geoffrey.levand@am.sony.com> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - arch/powerpc/kernel/ibmebus.c | 2 +- - arch/powerpc/kernel/of_device.c | 18 +++++++----------- - arch/powerpc/kernel/vio.c | 12 ++++++------ - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 6 +++--- - arch/powerpc/platforms/ps3/system-bus.c | 28 ++++++++++++---------------- - 5 files changed, 29 insertions(+), 37 deletions(-) - ---- a/arch/powerpc/kernel/ibmebus.c -+++ b/arch/powerpc/kernel/ibmebus.c -@@ -47,7 +47,7 @@ - #include <asm/abs_addr.h> - - static struct device ibmebus_bus_device = { /* fake "parent" device */ -- .bus_id = "ibmebus", -+ .init_name = "ibmebus", - }; - - struct bus_type ibmebus_bus_type; ---- a/arch/powerpc/kernel/of_device.c -+++ b/arch/powerpc/kernel/of_device.c -@@ -14,7 +14,6 @@ static void of_device_make_bus_id(struct - { - static atomic_t bus_no_reg_magic; - struct device_node *node = dev->node; -- char *name = dev->dev.bus_id; - const u32 *reg; - u64 addr; - int magic; -@@ -27,14 +26,12 @@ static void of_device_make_bus_id(struct - reg = of_get_property(node, "dcr-reg", NULL); - if (reg) { - #ifdef CONFIG_PPC_DCR_NATIVE -- snprintf(name, BUS_ID_SIZE, "d%x.%s", -- *reg, node->name); -+ dev_set_name(&dev->dev, "d%x.%s", *reg, node->name); - #else /* CONFIG_PPC_DCR_NATIVE */ - addr = of_translate_dcr_address(node, *reg, NULL); - if (addr != OF_BAD_ADDR) { -- snprintf(name, BUS_ID_SIZE, -- "D%llx.%s", (unsigned long long)addr, -- node->name); -+ dev_set_name(&dev->dev, "D%llx.%s", -+ (unsigned long long)addr, node->name); - return; - } - #endif /* !CONFIG_PPC_DCR_NATIVE */ -@@ -48,9 +45,8 @@ static void of_device_make_bus_id(struct - if (reg) { - addr = of_translate_address(node, reg); - if (addr != OF_BAD_ADDR) { -- snprintf(name, BUS_ID_SIZE, -- "%llx.%s", (unsigned long long)addr, -- node->name); -+ dev_set_name(&dev->dev, "%llx.%s", -+ (unsigned long long)addr, node->name); - return; - } - } -@@ -60,7 +56,7 @@ static void of_device_make_bus_id(struct - * counter (and pray...) - */ - magic = atomic_add_return(1, &bus_no_reg_magic); -- snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1); -+ dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1); - } - - struct of_device *of_device_alloc(struct device_node *np, -@@ -80,7 +76,7 @@ struct of_device *of_device_alloc(struct - dev->dev.archdata.of_node = np; - - if (bus_id) -- strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); -+ dev_set_name(&dev->dev, bus_id); - else - of_device_make_bus_id(dev); - ---- a/arch/powerpc/kernel/vio.c -+++ b/arch/powerpc/kernel/vio.c -@@ -41,9 +41,9 @@ - static struct bus_type vio_bus_type; - - static struct vio_dev vio_bus_device = { /* fake "parent" device */ -- .name = vio_bus_device.dev.bus_id, -+ .name = "vio", - .type = "", -- .dev.bus_id = "vio", -+ .dev.init_name = "vio", - .dev.bus = &vio_bus_type, - }; - -@@ -1216,7 +1216,7 @@ struct vio_dev *vio_register_device_node - - viodev->irq = irq_of_parse_and_map(of_node, 0); - -- snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%x", *unit_address); -+ dev_set_name(&viodev->dev, "%x", *unit_address); - viodev->name = of_node->name; - viodev->type = of_node->type; - viodev->unit_address = *unit_address; -@@ -1243,7 +1243,7 @@ struct vio_dev *vio_register_device_node - /* register with generic device framework */ - if (device_register(&viodev->dev)) { - printk(KERN_ERR "%s: failed to register device %s\n", -- __func__, viodev->dev.bus_id); -+ __func__, dev_name(&viodev->dev)); - /* XXX free TCE table */ - kfree(viodev); - return NULL; -@@ -1400,13 +1400,13 @@ static struct vio_dev *vio_find_name(con - struct vio_dev *vio_find_node(struct device_node *vnode) - { - const uint32_t *unit_address; -- char kobj_name[BUS_ID_SIZE]; -+ char kobj_name[20]; - - /* construct the kobject name from the device node */ - unit_address = of_get_property(vnode, "reg", NULL); - if (!unit_address) - return NULL; -- snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address); -+ snprintf(kobj_name, sizeof(kobj_name), "%x", *unit_address); - - return vio_find_name(kobj_name); - } ---- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c -+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c -@@ -231,7 +231,7 @@ static void __init mpc85xx_mds_setup_arc - - static int __init board_fixups(void) - { -- char phy_id[BUS_ID_SIZE]; -+ char phy_id[20]; - char *compstrs[2] = {"fsl,gianfar-mdio", "fsl,ucc-mdio"}; - struct device_node *mdio; - struct resource res; -@@ -241,13 +241,13 @@ static int __init board_fixups(void) - mdio = of_find_compatible_node(NULL, NULL, compstrs[i]); - - of_address_to_resource(mdio, 0, &res); -- snprintf(phy_id, BUS_ID_SIZE, "%x:%02x", res.start, 1); -+ snprintf(phy_id, sizeof(phy_id), "%x:%02x", res.start, 1); - - phy_register_fixup_for_id(phy_id, mpc8568_fixup_125_clock); - phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups); - - /* Register a workaround for errata */ -- snprintf(phy_id, BUS_ID_SIZE, "%x:%02x", res.start, 7); -+ snprintf(phy_id, sizeof(phy_id), "%x:%02x", res.start, 7); - phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups); - - of_node_put(mdio); ---- a/arch/powerpc/platforms/ps3/system-bus.c -+++ b/arch/powerpc/platforms/ps3/system-bus.c -@@ -31,7 +31,7 @@ - #include "platform.h" - - static struct device ps3_system_bus = { -- .bus_id = "ps3_system", -+ .init_name = "ps3_system", - }; - - /* FIXME: need device usage counters! */ -@@ -356,12 +356,12 @@ static int ps3_system_bus_match(struct d - if (result) - pr_info("%s:%d: dev=%u.%u(%s), drv=%u.%u(%s): match\n", - __func__, __LINE__, -- dev->match_id, dev->match_sub_id, dev->core.bus_id, -+ dev->match_id, dev->match_sub_id, dev_name(&dev->core), - drv->match_id, drv->match_sub_id, drv->core.name); - else - pr_debug("%s:%d: dev=%u.%u(%s), drv=%u.%u(%s): miss\n", - __func__, __LINE__, -- dev->match_id, dev->match_sub_id, dev->core.bus_id, -+ dev->match_id, dev->match_sub_id, dev_name(&dev->core), - drv->match_id, drv->match_sub_id, drv->core.name); - - return result; -@@ -383,9 +383,9 @@ static int ps3_system_bus_probe(struct d - result = drv->probe(dev); - else - pr_debug("%s:%d: %s no probe method\n", __func__, __LINE__, -- dev->core.bus_id); -+ dev_name(&dev->core)); - -- pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id); -+ pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev_name(&dev->core)); - return result; - } - -@@ -407,7 +407,7 @@ static int ps3_system_bus_remove(struct - dev_dbg(&dev->core, "%s:%d %s: no remove method\n", - __func__, __LINE__, drv->core.name); - -- pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id); -+ pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev_name(&dev->core)); - return result; - } - -@@ -432,7 +432,7 @@ static void ps3_system_bus_shutdown(stru - BUG_ON(!drv); - - dev_dbg(&dev->core, "%s:%d: %s -> %s\n", __func__, __LINE__, -- dev->core.bus_id, drv->core.name); -+ dev_name(&dev->core), drv->core.name); - - if (drv->shutdown) - drv->shutdown(dev); -@@ -742,22 +742,18 @@ int ps3_system_bus_device_register(struc - switch (dev->dev_type) { - case PS3_DEVICE_TYPE_IOC0: - dev->core.archdata.dma_ops = &ps3_ioc0_dma_ops; -- snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), -- "ioc0_%02x", ++dev_ioc0_count); -+ dev_set_name(&dev->core, "ioc0_%02x", ++dev_ioc0_count); - break; - case PS3_DEVICE_TYPE_SB: - dev->core.archdata.dma_ops = &ps3_sb_dma_ops; -- snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), -- "sb_%02x", ++dev_sb_count); -+ dev_set_name(&dev->core, "sb_%02x", ++dev_sb_count); - - break; - case PS3_DEVICE_TYPE_VUART: -- snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), -- "vuart_%02x", ++dev_vuart_count); -+ dev_set_name(&dev->core, "vuart_%02x", ++dev_vuart_count); - break; - case PS3_DEVICE_TYPE_LPM: -- snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), -- "lpm_%02x", ++dev_lpm_count); -+ dev_set_name(&dev->core, "lpm_%02x", ++dev_lpm_count); - break; - default: - BUG(); -@@ -766,7 +762,7 @@ int ps3_system_bus_device_register(struc - dev->core.archdata.of_node = NULL; - set_dev_node(&dev->core, 0); - -- pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id); -+ pr_debug("%s:%d add %s\n", __func__, __LINE__, dev_name(&dev->core)); - - result = device_register(&dev->core); - return result; diff --git a/driver-core/bus_id-rapidio.patch b/driver-core/bus_id-rapidio.patch deleted file mode 100644 index b613532e712854..00000000000000 --- a/driver-core/bus_id-rapidio.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: rapidio: struct device - replace bus_id with dev_name(), dev_set_name() - -Cc: Matt Porter <mporter@kernel.crashing.org> -Cc: Paul Mackerras <paulus@samba.org> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/rapidio/rio-scan.c | 8 ++++---- - include/linux/rio_drv.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- a/drivers/rapidio/rio-scan.c -+++ b/drivers/rapidio/rio-scan.c -@@ -365,15 +365,15 @@ static struct rio_dev *rio_setup_device( - rdid++) - rswitch->route_table[rdid] = RIO_INVALID_ROUTE; - rdev->rswitch = rswitch; -- sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id, -- rdev->rswitch->switchid); -+ dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id, -+ rdev->rswitch->switchid); - rio_route_set_ops(rdev); - - list_add_tail(&rswitch->node, &rio_switches); - - } else -- sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id, -- rdev->destid); -+ dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id, -+ rdev->destid); - - rdev->dev.bus = &rio_bus_type; - ---- a/include/linux/rio_drv.h -+++ b/include/linux/rio_drv.h -@@ -427,9 +427,9 @@ void rio_dev_put(struct rio_dev *); - * Get the unique RIO device identifier. Returns the device - * identifier string. - */ --static inline char *rio_name(struct rio_dev *rdev) -+static inline const char *rio_name(struct rio_dev *rdev) - { -- return rdev->dev.bus_id; -+ return dev_name(&rdev->dev); - } - - /** diff --git a/driver-core/bus_id-scsi.patch b/driver-core/bus_id-scsi.patch index 8335aa74d66081..829c194949e27b 100644 --- a/driver-core/bus_id-scsi.patch +++ b/driver-core/bus_id-scsi.patch @@ -202,7 +202,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #ifndef CONFIG_SYSFS_DEPRECATED dev->bus = &scsi_bus_type; #endif -@@ -1010,7 +1009,7 @@ static int scsi_probe_and_add_lun(struct +@@ -1021,7 +1020,7 @@ static int scsi_probe_and_add_lun(struct if (rescan || !scsi_device_created(sdev)) { SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: device exists on %s\n", @@ -211,7 +211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (sdevp) *sdevp = sdev; else -@@ -1149,7 +1148,7 @@ static void scsi_sequential_lun_scan(str +@@ -1160,7 +1159,7 @@ static void scsi_sequential_lun_scan(str struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of" @@ -257,7 +257,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> transport_setup_device(dev); error = device_add(dev); -@@ -3157,8 +3157,8 @@ fc_vport_setup(struct Scsi_Host *shost, +@@ -3164,8 +3164,8 @@ fc_vport_setup(struct Scsi_Host *shost, device_initialize(dev); /* takes self reference */ dev->parent = get_device(pdev); /* takes parent reference */ dev->release = fc_vport_dev_release; @@ -268,7 +268,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> transport_setup_device(dev); error = device_add(dev); -@@ -3181,19 +3181,19 @@ fc_vport_setup(struct Scsi_Host *shost, +@@ -3188,19 +3188,19 @@ fc_vport_setup(struct Scsi_Host *shost, */ if (pdev != &shost->shost_gendev) { error = sysfs_create_link(&shost->shost_gendev.kobj, @@ -291,7 +291,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> shost->host_no, channel); *ret_vport = vport; -@@ -3290,7 +3290,7 @@ fc_vport_terminate(struct fc_vport *vpor +@@ -3297,7 +3297,7 @@ fc_vport_terminate(struct fc_vport *vpor return stat; if (dev->parent != &shost->shost_gendev) @@ -300,7 +300,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> transport_remove_device(dev); device_del(dev); transport_destroy_device(dev); -@@ -3322,7 +3322,7 @@ fc_vport_sched_delete(struct work_struct +@@ -3329,7 +3329,7 @@ fc_vport_sched_delete(struct work_struct dev_printk(KERN_ERR, vport->dev.parent, "%s: %s could not be deleted created via " "shost%d channel %d - error %d\n", __func__, @@ -495,7 +495,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -1875,7 +1875,7 @@ static int sd_probe(struct device *dev) +@@ -1876,7 +1876,7 @@ static int sd_probe(struct device *dev) device_initialize(&sdkp->dev); sdkp->dev.parent = &sdp->sdev_gendev; sdkp->dev.class = &sd_disk_class; @@ -506,7 +506,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto out_free_index; --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c -@@ -525,7 +525,7 @@ static int ses_intf_add(struct device *c +@@ -526,7 +526,7 @@ static int ses_intf_add(struct device *c if (!scomp) goto err_free; diff --git a/driver-core/bus_id-serial.patch b/driver-core/bus_id-serial.patch index 60c2a3c7b7b2a7..f744d07a026bc1 100644 --- a/driver-core/bus_id-serial.patch +++ b/driver-core/bus_id-serial.patch @@ -9,7 +9,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c -@@ -2049,7 +2049,7 @@ int uart_suspend_port(struct uart_driver +@@ -2030,7 +2030,7 @@ int uart_suspend_port(struct uart_driver if (!tries) printk(KERN_ERR "%s%s%s%d: Unable to drain " "transmitter\n", @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> port->dev ? ": " : "", drv->dev_name, drv->tty_driver->name_base + port->line); -@@ -2175,7 +2175,7 @@ uart_report_port(struct uart_driver *drv +@@ -2156,7 +2156,7 @@ uart_report_port(struct uart_driver *drv } printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n", diff --git a/driver-core/bus_id-ssb.patch b/driver-core/bus_id-ssb.patch deleted file mode 100644 index f8a0496badf0f4..00000000000000 --- a/driver-core/bus_id-ssb.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: ssb: struct device - replace bus_id with dev_name(), dev_set_name() - -Acked-by: Michael Buesch <mb@bu3sch.de> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/ssb/main.c | 11 +++++------ - drivers/ssb/pcihost_wrapper.c | 2 +- - 2 files changed, 6 insertions(+), 7 deletions(-) - ---- a/drivers/ssb/main.c -+++ b/drivers/ssb/main.c -@@ -226,7 +226,7 @@ int ssb_devices_freeze(struct ssb_bus *b - err = drv->suspend(dev, state); - if (err) { - ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n", -- dev->dev->bus_id); -+ dev_name(dev->dev)); - goto err_unwind; - } - } -@@ -269,7 +269,7 @@ int ssb_devices_thaw(struct ssb_bus *bus - err = drv->resume(dev); - if (err) { - ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n", -- dev->dev->bus_id); -+ dev_name(dev->dev)); - } - } - -@@ -454,8 +454,7 @@ static int ssb_devices_register(struct s - - dev->release = ssb_release_dev; - dev->bus = &ssb_bustype; -- snprintf(dev->bus_id, sizeof(dev->bus_id), -- "ssb%u:%d", bus->busnumber, dev_idx); -+ dev_set_name(dev, "ssb%u:%d", bus->busnumber, dev_idx); - - switch (bus->bustype) { - case SSB_BUSTYPE_PCI: -@@ -480,7 +479,7 @@ static int ssb_devices_register(struct s - if (err) { - ssb_printk(KERN_ERR PFX - "Could not register %s\n", -- dev->bus_id); -+ dev_name(dev)); - /* Set dev to NULL to not unregister - * dev on error unwinding. */ - sdev->dev = NULL; -@@ -796,7 +795,7 @@ int ssb_bus_pcibus_register(struct ssb_b - err = ssb_bus_register(bus, ssb_pci_get_invariants, 0); - if (!err) { - ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on " -- "PCI device %s\n", host_pci->dev.bus_id); -+ "PCI device %s\n", dev_name(&host_pci->dev)); - } - - return err; ---- a/drivers/ssb/pcihost_wrapper.c -+++ b/drivers/ssb/pcihost_wrapper.c -@@ -65,7 +65,7 @@ static int ssb_pcihost_probe(struct pci_ - err = pci_enable_device(dev); - if (err) - goto err_kfree_ssb; -- name = dev->dev.bus_id; -+ name = dev_name(&dev->dev); - if (dev->driver && dev->driver->name) - name = dev->driver->name; - err = pci_request_regions(dev, name); diff --git a/driver-core/bus_id-swiotlb.patch b/driver-core/bus_id-swiotlb.patch index 45ccff02216ed5..c6b1c416fa9901 100644 --- a/driver-core/bus_id-swiotlb.patch +++ b/driver-core/bus_id-swiotlb.patch @@ -9,7 +9,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/lib/swiotlb.c +++ b/lib/swiotlb.c -@@ -533,7 +533,7 @@ swiotlb_full(struct device *dev, size_t +@@ -648,7 +648,7 @@ swiotlb_full(struct device *dev, size_t * the damage, or panic when the transfer is too big. */ printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at " diff --git a/driver-core/make-debug-take-precedence-over-dynamic_printk_debug.patch b/driver-core/make-debug-take-precedence-over-dynamic_printk_debug.patch index 4dc86ab9b726e1..194828879430f8 100644 --- a/driver-core/make-debug-take-precedence-over-dynamic_printk_debug.patch +++ b/driver-core/make-debug-take-precedence-over-dynamic_printk_debug.patch @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; }) --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -338,13 +338,13 @@ static inline char *pack_hex_byte(char * +@@ -349,13 +349,13 @@ static inline char *pack_hex_byte(char * printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) /* If you are writing a driver, please use dev_dbg instead */ diff --git a/driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch b/driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch index 59b8378a4e568a..2a6e327a0dc863 100644 --- a/driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch +++ b/driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch @@ -522,7 +522,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* interface for exporting device attributes */ --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -415,7 +415,6 @@ struct pci_driver { +@@ -421,7 +421,6 @@ struct pci_driver { int (*resume_early) (struct pci_dev *dev); int (*resume) (struct pci_dev *dev); /* Device woken up */ void (*shutdown) (struct pci_dev *dev); diff --git a/driver-core/s390-remove-s390_root_dev_.patch b/driver-core/s390-remove-s390_root_dev_.patch index 1b3779ad7b6cb0..363ba8a93ed941 100644 --- a/driver-core/s390-remove-s390_root_dev_.patch +++ b/driver-core/s390-remove-s390_root_dev_.patch @@ -49,15 +49,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -#endif /* _S390_RDEV_H_ */ --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c -@@ -15,7 +15,6 @@ +@@ -18,7 +18,6 @@ #include <asm/io.h> #include <linux/completion.h> #include <linux/interrupt.h> -#include <asm/s390_rdev.h> - //#define DCSSBLK_DEBUG /* Debug messages on/off */ #define DCSSBLK_NAME "dcssblk" -@@ -951,7 +950,7 @@ dcssblk_check_params(void) + #define DCSSBLK_MINORS_PER_DISK 1 +@@ -946,7 +945,7 @@ dcssblk_check_params(void) static void __exit dcssblk_exit(void) { @@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> unregister_blkdev(dcssblk_major, DCSSBLK_NAME); } -@@ -960,22 +959,22 @@ dcssblk_init(void) +@@ -955,22 +954,22 @@ dcssblk_init(void) { int rc; @@ -95,15 +95,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dcssblk_major = rc; --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c -@@ -32,7 +32,6 @@ +@@ -36,7 +36,6 @@ #include <linux/notifier.h> #include <linux/kthread.h> #include <linux/mutex.h> -#include <asm/s390_rdev.h> #include <asm/reset.h> - #include <linux/hrtimer.h> - #include <linux/ktime.h> -@@ -1358,7 +1357,7 @@ int __init ap_module_init(void) + #include <asm/airq.h> + #include <asm/atomic.h> +@@ -1522,7 +1521,7 @@ int __init ap_module_init(void) } /* Create /sys/devices/ap. */ @@ -112,7 +112,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> rc = IS_ERR(ap_root_device) ? PTR_ERR(ap_root_device) : 0; if (rc) goto out_bus; -@@ -1401,7 +1400,7 @@ out_work: +@@ -1565,7 +1564,7 @@ out_work: hrtimer_cancel(&ap_poll_timer); destroy_workqueue(ap_work_queue); out_root: @@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> out_bus: while (i--) bus_remove_file(&ap_bus_type, ap_bus_attrs[i]); -@@ -1432,7 +1431,7 @@ void ap_module_exit(void) +@@ -1600,7 +1599,7 @@ void ap_module_exit(void) hrtimer_cancel(&ap_poll_timer); destroy_workqueue(ap_work_queue); tasklet_kill(&ap_tasklet); @@ -140,7 +140,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define VIRTIO_SUBCODE_64 0x0D00 -@@ -315,7 +314,7 @@ static int __init kvm_devices_init(void) +@@ -335,7 +334,7 @@ static int __init kvm_devices_init(void) if (!MACHINE_IS_KVM) return -ENODEV; @@ -149,7 +149,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (IS_ERR(kvm_root)) { rc = PTR_ERR(kvm_root); printk(KERN_ERR "Could not register kvm_s390 root device"); -@@ -324,7 +323,7 @@ static int __init kvm_devices_init(void) +@@ -344,7 +343,7 @@ static int __init kvm_devices_init(void) rc = vmem_add_mapping(real_memory_size, PAGE_SIZE); if (rc) { @@ -205,7 +205,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> MODULE_DEVICE_TABLE(ccw,cu3088_ids); --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c -@@ -21,7 +21,6 @@ +@@ -24,7 +24,6 @@ #include <asm/ebcdic.h> #include <asm/io.h> @@ -213,7 +213,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include "qeth_core.h" #include "qeth_core_offl.h" -@@ -4465,7 +4464,7 @@ static int __init qeth_core_init(void) +@@ -4496,7 +4495,7 @@ static int __init qeth_core_init(void) &driver_attr_group); if (rc) goto driver_err; @@ -222,7 +222,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> rc = IS_ERR(qeth_core_root_dev) ? PTR_ERR(qeth_core_root_dev) : 0; if (rc) goto register_err; -@@ -4479,7 +4478,7 @@ static int __init qeth_core_init(void) +@@ -4510,7 +4509,7 @@ static int __init qeth_core_init(void) return 0; slab_err: @@ -231,7 +231,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> register_err: driver_remove_file(&qeth_core_ccwgroup_driver.driver, &driver_attr_group); -@@ -4496,7 +4495,7 @@ out_err: +@@ -4528,7 +4527,7 @@ out_err: static void __exit qeth_core_exit(void) { @@ -242,7 +242,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver); --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c -@@ -17,8 +17,6 @@ +@@ -20,8 +20,6 @@ #include <linux/mii.h> #include <linux/ip.h> @@ -253,7 +253,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c -@@ -23,8 +23,6 @@ +@@ -26,8 +26,6 @@ #include <net/ip.h> #include <net/arp.h> @@ -318,7 +318,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -EXPORT_SYMBOL(s390_root_dev_unregister); --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c -@@ -47,7 +47,6 @@ +@@ -50,7 +50,6 @@ #include <asm/ebcdic.h> #include <asm/io.h> #include <asm/s390_ext.h> @@ -326,7 +326,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <asm/smp.h> /* -@@ -1609,7 +1608,7 @@ static int __init iucv_init(void) +@@ -1692,7 +1691,7 @@ static int __init iucv_init(void) rc = register_external_interrupt(0x4000, iucv_external_interrupt); if (rc) goto out; @@ -335,7 +335,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (IS_ERR(iucv_root)) { rc = PTR_ERR(iucv_root); goto out_int; -@@ -1653,7 +1652,7 @@ out_free: +@@ -1736,7 +1735,7 @@ out_free: kfree(iucv_irq_data[cpu]); iucv_irq_data[cpu] = NULL; } @@ -344,7 +344,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> out_int: unregister_external_interrupt(0x4000, iucv_external_interrupt); out: -@@ -1683,7 +1682,7 @@ static void __exit iucv_exit(void) +@@ -1766,7 +1765,7 @@ static void __exit iucv_exit(void) kfree(iucv_irq_data[cpu]); iucv_irq_data[cpu] = NULL; } diff --git a/driver-core/virtio-do-not-statically-allocate-root-device.patch b/driver-core/virtio-do-not-statically-allocate-root-device.patch index 6e3fcb01a8de87..edcf273dd23971 100644 --- a/driver-core/virtio-do-not-statically-allocate-root-device.patch +++ b/driver-core/virtio-do-not-statically-allocate-root-device.patch @@ -32,22 +32,22 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * would make more sense for virtio to not insist on having it's own device. */ -static struct device virtio_pci_root = { - .parent = NULL, -- .bus_id = "virtio-pci", +- .init_name = "virtio-pci", -}; +static struct device *virtio_pci_root; /* Convert a generic virtio device to our structure */ static struct virtio_pci_device *to_vp_device(struct virtio_device *vdev) -@@ -327,7 +324,7 @@ static int __devinit virtio_pci_probe(st +@@ -343,7 +340,7 @@ static int __devinit virtio_pci_probe(st if (vp_dev == NULL) return -ENOMEM; - vp_dev->vdev.dev.parent = &virtio_pci_root; + vp_dev->vdev.dev.parent = virtio_pci_root; + vp_dev->vdev.dev.release = virtio_pci_release_dev; vp_dev->vdev.config = &virtio_pci_config_ops; vp_dev->pci_dev = pci_dev; - INIT_LIST_HEAD(&vp_dev->virtqueues); -@@ -426,13 +423,13 @@ static int __init virtio_pci_init(void) +@@ -437,13 +434,13 @@ static int __init virtio_pci_init(void) { int err; @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return err; } -@@ -441,8 +438,8 @@ module_init(virtio_pci_init); +@@ -452,8 +449,8 @@ module_init(virtio_pci_init); static void __exit virtio_pci_exit(void) { 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 6a9e0f0f005707..b252b98f99a856 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 -@@ -789,12 +789,21 @@ static void run_init_process(char *init_ +@@ -783,12 +783,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } diff --git a/gregkh.pre/sysrq-u-laptop.patch b/gregkh.pre/sysrq-u-laptop.patch index 66b0b7a09a5bad..d322fb622a8553 100644 --- a/gregkh.pre/sysrq-u-laptop.patch +++ b/gregkh.pre/sysrq-u-laptop.patch @@ -12,12 +12,12 @@ From: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c -@@ -405,7 +405,7 @@ static struct sysrq_key_op *sysrq_key_ta +@@ -421,7 +421,7 @@ static struct sysrq_key_op *sysrq_key_ta /* x: May be registered on ppc/powerpc for xmon */ NULL, /* x */ /* y: May be registered on sparc64 for global register dump */ - NULL, /* y */ + &sysrq_mountro_op, /* y stupid fujitsu laptop, can't hit the U key */ - NULL /* z */ + &sysrq_ftrace_dump_op, /* z */ }; @@ -66,13 +66,10 @@ driver-core/bus_id-video.patch driver-core/bus_id-tifm.patch driver-core/bus_id-thermal.patch driver-core/bus_id-swiotlb.patch -driver-core/bus_id-ssb.patch driver-core/bus_id-spi.patch driver-core/bus_id-sgi.patch driver-core/bus_id-serial.patch driver-core/bus_id-scsi.patch -driver-core/bus_id-rapidio.patch -driver-core/bus_id-powerpc.patch driver-core/bus_id-power.patch driver-core/bus_id-pnp.patch driver-core/bus_id-mwave.patch @@ -480,3 +477,4 @@ staging/staging-android-binder-fix-build-errors.patch #usb-remove-err-macro-from-usb.h.patch +f.patch diff --git a/staging/staging-kconfig-for-arch-arm-8300-cris.patch b/staging/staging-kconfig-for-arch-arm-8300-cris.patch index 014ff5c8032e2e..8c48ff368f3c26 100644 --- a/staging/staging-kconfig-for-arch-arm-8300-cris.patch +++ b/staging/staging-kconfig-for-arch-arm-8300-cris.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1276,6 +1276,8 @@ source "drivers/regulator/Kconfig" +@@ -1325,6 +1325,8 @@ source "drivers/regulator/Kconfig" source "drivers/uio/Kconfig" diff --git a/staging/staging-slicoss-use-correct-type-for-memory-allcations.patch b/staging/staging-slicoss-use-correct-type-for-memory-allcations.patch index 45f3aad7f0c2eb..ed224ceddb5739 100644 --- a/staging/staging-slicoss-use-correct-type-for-memory-allcations.patch +++ b/staging/staging-slicoss-use-correct-type-for-memory-allcations.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> &adapter-> phys_shmem); /* -@@ -1432,7 +1432,7 @@ static void slic_init_cleanup(struct ada +@@ -1431,7 +1431,7 @@ static void slic_init_cleanup(struct ada DBG_MSG("adapter[%p] port %d pshmem[%p] FreeShmem ", adapter, adapter->port, (void *) adapter->pshmem); pci_free_consistent(adapter->pcidev, @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> adapter->pshmem, adapter->phys_shmem); adapter->pshmem = NULL; adapter->phys_shmem = (dma_addr_t) NULL; -@@ -2833,7 +2833,7 @@ static u32 slic_card_locate(struct adapt +@@ -2832,7 +2832,7 @@ static u32 slic_card_locate(struct adapt } if (!physcard) { /* no structure allocated for this physical card yet */ diff --git a/staging/staging-slicoss-use-kzalloc.patch b/staging/staging-slicoss-use-kzalloc.patch index 9357f5301cefda..117d05ed84571d 100644 --- a/staging/staging-slicoss-use-kzalloc.patch +++ b/staging/staging-slicoss-use-kzalloc.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c -@@ -2833,9 +2833,8 @@ static u32 slic_card_locate(struct adapt +@@ -2832,9 +2832,8 @@ static u32 slic_card_locate(struct adapt } if (!physcard) { /* no structure allocated for this physical card yet */ diff --git a/staging/staging-slicoss-use-request_firmware.patch b/staging/staging-slicoss-use-request_firmware.patch index e7e79c23f1399e..d892894492fa0c 100644 --- a/staging/staging-slicoss-use-request_firmware.patch +++ b/staging/staging-slicoss-use-request_firmware.patch @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #if SLIC_DUMP_ENABLED #include "slicdump.h" -@@ -2187,6 +2179,9 @@ static void slic_card_cleanup(struct sli +@@ -2186,6 +2178,9 @@ static void slic_card_cleanup(struct sli static int slic_card_download_gbrcv(struct adapter *adapter) { @@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> __iomem struct slic_regs *slic_regs = adapter->slic_regs; u32 codeaddr; unsigned char *instruction = NULL; -@@ -2194,12 +2189,32 @@ static int slic_card_download_gbrcv(stru +@@ -2193,12 +2188,32 @@ static int slic_card_download_gbrcv(stru switch (adapter->devid) { case SLIC_2GB_DEVICE_ID: @@ -139,7 +139,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; default: ASSERT(0); -@@ -2226,13 +2241,16 @@ static int slic_card_download_gbrcv(stru +@@ -2225,13 +2240,16 @@ static int slic_card_download_gbrcv(stru } /* download finished */ @@ -157,7 +157,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> u32 section; int thissectionsize; int codeaddr; -@@ -2256,6 +2274,7 @@ static int slic_card_download(struct ada +@@ -2255,6 +2273,7 @@ static int slic_card_download(struct ada case SLIC_2GB_DEVICE_ID: /* DBG_MSG ("slicoss: %s devid==SLIC_2GB_DEVICE_ID sections[%x]\n", __func__, (uint) ONumSections); */ @@ -165,7 +165,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> numsects = ONumSections; for (i = 0; i < numsects; i++) { sectsize[i] = OSectionSize[i]; -@@ -2265,6 +2284,7 @@ static int slic_card_download(struct ada +@@ -2264,6 +2283,7 @@ static int slic_card_download(struct ada case SLIC_1GB_DEVICE_ID: /* DBG_MSG ("slicoss: %s devid==SLIC_1GB_DEVICE_ID sections[%x]\n", __func__, (uint) MNumSections); */ @@ -173,7 +173,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> numsects = MNumSections; for (i = 0; i < numsects; i++) { sectsize[i] = MSectionSize[i]; -@@ -2275,26 +2295,33 @@ static int slic_card_download(struct ada +@@ -2274,26 +2294,33 @@ static int slic_card_download(struct ada ASSERT(0); break; } @@ -213,7 +213,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; default: ASSERT(0); -@@ -2330,10 +2357,12 @@ static int slic_card_download(struct ada +@@ -2329,10 +2356,12 @@ static int slic_card_download(struct ada for (section = 0; section < numsects; section++) { switch (adapter->devid) { case SLIC_2GB_DEVICE_ID: @@ -228,7 +228,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; default: ASSERT(0); -@@ -2375,13 +2404,13 @@ static int slic_card_download(struct ada +@@ -2374,13 +2403,13 @@ static int slic_card_download(struct ada thissectionsize[%x] failure[%x]\n", __func__, codeaddr, thissectionsize, failure); diff --git a/staging/staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch b/staging/staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch index cd4e4b5d810d64..639d95288fcde8 100644 --- a/staging/staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch +++ b/staging/staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch @@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { PADAPTER Adapter; PWBLINUX pWbLinux; -@@ -353,7 +351,7 @@ int wb35_close(struct net_device *netdev +@@ -357,7 +355,7 @@ int wb35_close(struct net_device *netdev return 0; } diff --git a/staging/staging-w35und-remove-unused-wb35_open-and-wb35_close-functions.patch b/staging/staging-w35und-remove-unused-wb35_open-and-wb35_close-functions.patch index 1d314e5cd9f432..06dec59ad17962 100644 --- a/staging/staging-w35und-remove-unused-wb35_open-and-wb35_close-functions.patch +++ b/staging/staging-w35und-remove-unused-wb35_open-and-wb35_close-functions.patch @@ -16,38 +16,9 @@ Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/staging/winbond/linux/wbusb.c | 19 ------------------- drivers/staging/winbond/linux/wbusb_f.h | 2 -- - 2 files changed, 21 deletions(-) + 1 file changed, 2 deletions(-) ---- a/drivers/staging/winbond/linux/wbusb.c -+++ b/drivers/staging/winbond/linux/wbusb.c -@@ -332,25 +332,6 @@ WbUsb_destroy(phw_data_t pHwData) - { - } - --int wb35_open(struct net_device *netdev) --{ -- PADAPTER Adapter = (PADAPTER)netdev->priv; -- phw_data_t pHwData = &Adapter->sHwData; -- -- netif_start_queue(netdev); -- -- //TODO : put here temporarily -- hal_set_accept_broadcast(pHwData, 1); // open accept broadcast -- -- return 0; --} -- --int wb35_close(struct net_device *netdev) --{ -- netif_stop_queue(netdev); -- return 0; --} -- - static void wb35_disconnect(struct usb_interface *intf) - { - PWBLINUX pWbLinux; --- a/drivers/staging/winbond/linux/wbusb_f.h +++ b/drivers/staging/winbond/linux/wbusb_f.h @@ -11,8 +11,6 @@ diff --git a/staging/staging-wlan-ng-delete-a-large-pile-of-now-unused-code.patch b/staging/staging-wlan-ng-delete-a-large-pile-of-now-unused-code.patch index 60d1b3b77c5e5b..a319610da43e02 100644 --- a/staging/staging-wlan-ng-delete-a-large-pile-of-now-unused-code.patch +++ b/staging/staging-wlan-ng-delete-a-large-pile-of-now-unused-code.patch @@ -1219,7 +1219,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - static void p80211knetdev_tx_timeout( netdevice_t *netdev) { - wlandevice_t *wlandev = (wlandevice_t*)netdev->priv; + wlandevice_t *wlandev = netdev->ml_priv; @@ -1257,7 +1242,7 @@ static void p80211knetdev_tx_timeout( ne } else { WLAN_LOG_WARNING("Implement tx_timeout for %s\n", diff --git a/staging/staging-wlan-ng-eliminate-all-backwards-compatibility-for-2.6.13-kernels.patch b/staging/staging-wlan-ng-eliminate-all-backwards-compatibility-for-2.6.13-kernels.patch index 73424eda3e4b89..232876e7577b18 100644 --- a/staging/staging-wlan-ng-eliminate-all-backwards-compatibility-for-2.6.13-kernels.patch +++ b/staging/staging-wlan-ng-eliminate-all-backwards-compatibility-for-2.6.13-kernels.patch @@ -16,9 +16,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/staging/wlan-ng/p80211mod.c | 5 drivers/staging/wlan-ng/p80211netdev.c | 16 -- drivers/staging/wlan-ng/p80211netdev.h | 4 - drivers/staging/wlan-ng/p80211wext.c | 214 --------------------------------- + drivers/staging/wlan-ng/p80211wext.c | 213 --------------------------------- drivers/staging/wlan-ng/wlan_compat.h | 27 ---- - 6 files changed, 5 insertions(+), 296 deletions(-) + 6 files changed, 5 insertions(+), 295 deletions(-) --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -345,7 +345,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; struct iw_handler_def p80211wext_handler_def = { -@@ -1858,168 +1803,15 @@ struct iw_handler_def p80211wext_handler +@@ -1858,160 +1803,9 @@ struct iw_handler_def p80211wext_handler .standard = p80211wext_handlers, .private = NULL, .private_args = NULL, @@ -359,7 +359,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -/* wireless extensions' ioctls */ -int p80211wext_support_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) -{ -- wlandevice_t *wlandev = (wlandevice_t*)dev->priv; +- wlandevice_t *wlandev = dev->ml_priv; - -#if WIRELESS_EXT < 13 - struct iwreq *iwr = (struct iwreq*)ifr; @@ -503,10 +503,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - DBFEXIT; - return (err); -} -- + int p80211wext_event_associated(wlandevice_t *wlandev, int assoc) { - union iwreq_data data; +@@ -2019,7 +1813,6 @@ int p80211wext_event_associated(wlandevi DBFENTER; @@ -514,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Send the association state first */ data.ap_addr.sa_family = ARPHRD_ETHER; if (assoc) { -@@ -2034,7 +1826,7 @@ int p80211wext_event_associated(wlandevi +@@ -2034,7 +1827,7 @@ int p80211wext_event_associated(wlandevi if (!assoc) goto done; // XXX send association data, like IEs, etc etc. diff --git a/staging/staging-wlan-ng-p80211netdev.c-fix-netdev-alloc-to-prevent-oops-on-device-start.patch b/staging/staging-wlan-ng-p80211netdev.c-fix-netdev-alloc-to-prevent-oops-on-device-start.patch index ceb9b10254b3f5..24272f1f093bc5 100644 --- a/staging/staging-wlan-ng-p80211netdev.c-fix-netdev-alloc-to-prevent-oops-on-device-start.patch +++ b/staging/staging-wlan-ng-p80211netdev.c-fix-netdev-alloc-to-prevent-oops-on-device-start.patch @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - memset( dev, 0, sizeof(netdevice_t)); - ether_setup(dev); wlandev->netdev = dev; - dev->priv = wlandev; + dev->ml_priv = wlandev; dev->hard_start_xmit = p80211knetdev_hard_start_xmit; @@ -927,15 +925,9 @@ int register_wlandev(wlandevice_t *wland diff --git a/staging/staging-wlan-ng-use-standard-kernel-integer-types.patch b/staging/staging-wlan-ng-use-standard-kernel-integer-types.patch index 4fd34c6d3ded3a..502e45de42526e 100644 --- a/staging/staging-wlan-ng-use-standard-kernel-integer-types.patch +++ b/staging/staging-wlan-ng-use-standard-kernel-integer-types.patch @@ -5458,7 +5458,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> @@ -649,7 +649,7 @@ static int p80211knetdev_do_ioctl(netdev int result = 0; p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr; - wlandevice_t *wlandev = (wlandevice_t*)dev->priv; + wlandevice_t *wlandev = dev->ml_priv; - UINT8 *msgbuf; + u8 *msgbuf; DBFENTER; @@ -5468,8 +5468,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> resultcode->data = 0; /* now fire the request */ -- result = p80211req_dorequest(dev->priv, (UINT8*)&dot11req); -+ result = p80211req_dorequest(dev->priv, (u8*)&dot11req); +- result = p80211req_dorequest(dev->ml_priv, (UINT8 *)&dot11req); ++ result = p80211req_dorequest(dev->ml_priv, (u8 *)&dot11req); /* If the request wasn't successful, report an error and don't * change the netdev address diff --git a/staging/staging-wlan-ng-wireless-extension-support-is-mandatory.patch b/staging/staging-wlan-ng-wireless-extension-support-is-mandatory.patch index e982d5de9ea557..586ffdc73ee64a 100644 --- a/staging/staging-wlan-ng-wireless-extension-support-is-mandatory.patch +++ b/staging/staging-wlan-ng-wireless-extension-support-is-mandatory.patch @@ -89,7 +89,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static u8 p80211_mhz_to_channel(u16 mhz) { -@@ -1829,8 +1827,5 @@ int p80211wext_event_associated(wlandevi +@@ -1830,8 +1828,5 @@ int p80211wext_event_associated(wlandevi } diff --git a/usb/i2400m-makefile-and-kconfig.patch b/usb/i2400m-makefile-and-kconfig.patch index 81866c35daa001..2dd38210abd5ce 100644 --- a/usb/i2400m-makefile-and-kconfig.patch +++ b/usb/i2400m-makefile-and-kconfig.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -2585,6 +2585,8 @@ source "drivers/net/tokenring/Kconfig" +@@ -2614,6 +2614,8 @@ source "drivers/net/tokenring/Kconfig" source "drivers/net/wireless/Kconfig" @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> source "drivers/net/pcmcia/Kconfig" --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -262,3 +262,4 @@ obj-$(CONFIG_NIU) += niu.o +@@ -263,3 +263,4 @@ obj-$(CONFIG_NIU) += niu.o obj-$(CONFIG_VIRTIO_NET) += virtio_net.o obj-$(CONFIG_SFC) += sfc/ diff --git a/usb/usb-avoid-needless-address-taking-of-function-parameters.patch b/usb/usb-avoid-needless-address-taking-of-function-parameters.patch index c29db52ce24fe2..222fc0dd6eebb4 100644 --- a/usb/usb-avoid-needless-address-taking-of-function-parameters.patch +++ b/usb/usb-avoid-needless-address-taking-of-function-parameters.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pipe, --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c -@@ -149,8 +149,8 @@ static int get_registers(pegasus_t * peg +@@ -150,8 +150,8 @@ static int get_registers(pegasus_t * peg pegasus->dr.bRequestType = PEGASUS_REQT_READ; pegasus->dr.bRequest = PEGASUS_REQ_GET_REGS; pegasus->dr.wValue = cpu_to_le16(0); @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pegasus->ctrl_urb->transfer_buffer_length = size; usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb, -@@ -207,8 +207,8 @@ static int set_registers(pegasus_t * peg +@@ -208,8 +208,8 @@ static int set_registers(pegasus_t * peg pegasus->dr.bRequestType = PEGASUS_REQT_WRITE; pegasus->dr.bRequest = PEGASUS_REQ_SET_REGS; pegasus->dr.wValue = cpu_to_le16(0); @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pegasus->ctrl_urb->transfer_buffer_length = size; usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb, -@@ -260,7 +260,7 @@ static int set_register(pegasus_t * pega +@@ -261,7 +261,7 @@ static int set_register(pegasus_t * pega pegasus->dr.bRequestType = PEGASUS_REQT_WRITE; pegasus->dr.bRequest = PEGASUS_REQ_SET_REG; pegasus->dr.wValue = cpu_to_le16(data); @@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pegasus->dr.wLength = cpu_to_le16(1); pegasus->ctrl_urb->transfer_buffer_length = 1; -@@ -475,7 +475,7 @@ static inline void get_node_id(pegasus_t +@@ -476,7 +476,7 @@ static inline void get_node_id(pegasus_t for (i = 0; i < 3; i++) { read_eprom_word(pegasus, i, &w16); diff --git a/usb/usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch b/usb/usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch index 830aec882b647f..2869d855da1291 100644 --- a/usb/usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch +++ b/usb/usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch @@ -37,8 +37,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <mach/hardware.h> -#include <mach/regs-gpio.h> - #include <asm/plat-s3c24xx/regs-udc.h> - #include <asm/plat-s3c24xx/udc.h> + #include <plat/regs-udc.h> + #include <plat/udc.h> @@ -1510,11 +1510,7 @@ static irqreturn_t s3c2410_udc_vbus_irq( dprintk(DEBUG_NORMAL, "%s()\n", __func__); diff --git a/usb/usb-m66592-and-r8a66597-resource-changes.patch b/usb/usb-m66592-and-r8a66597-resource-changes.patch index 115ca37fb814f1..ef47272026884d 100644 --- a/usb/usb-m66592-and-r8a66597-resource-changes.patch +++ b/usb/usb-m66592-and-r8a66597-resource-changes.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/gadget/m66592-udc.c +++ b/drivers/usb/gadget/m66592-udc.c -@@ -1548,8 +1548,6 @@ static void nop_completion(struct usb_ep +@@ -1546,8 +1546,6 @@ static void nop_completion(struct usb_ep { } @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __init m66592_probe(struct platform_device *pdev) { struct resource *res; -@@ -1559,11 +1557,10 @@ static int __init m66592_probe(struct pl +@@ -1560,11 +1558,10 @@ static int __init m66592_probe(struct pl int ret = 0; int i; @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto clean_up; } -@@ -1574,7 +1571,7 @@ static int __init m66592_probe(struct pl +@@ -1575,7 +1572,7 @@ static int __init m66592_probe(struct pl goto clean_up; } @@ -57,15 +57,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pr_err("ioremap error.\n"); --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c -@@ -2265,7 +2265,6 @@ static int __init_or_module r8a66597_rem +@@ -2275,7 +2275,6 @@ static int __init_or_module r8a66597_rem return 0; } -#define resource_len(r) (((r)->end - (r)->start) + 1) static int __init r8a66597_probe(struct platform_device *pdev) { - struct resource *res = NULL, *ires; -@@ -2283,11 +2282,10 @@ static int __init r8a66597_probe(struct + #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) && defined(CONFIG_HAVE_CLK) +@@ -2296,11 +2295,10 @@ static int __init r8a66597_probe(struct goto clean_up; } @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto clean_up; } -@@ -2302,7 +2300,7 @@ static int __init r8a66597_probe(struct +@@ -2315,7 +2313,7 @@ static int __init r8a66597_probe(struct irq = ires->start; irq_trigger = ires->flags & IRQF_TRIGGER_MASK; diff --git a/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch b/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch index b8249f632fca0c..790e000112b6fd 100644 --- a/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch +++ b/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2979,6 +2979,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CON +@@ -2985,6 +2985,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CON P: Felipe Balbi M: felipe.balbi@nokia.com L: linux-usb@vger.kernel.org diff --git a/usb/usb-remove-restrictions-on-signal-numbers-in-devio.c.patch b/usb/usb-remove-restrictions-on-signal-numbers-in-devio.c.patch index aaa2fd5ac586da..9a63e5b72bfeff 100644 --- a/usb/usb-remove-restrictions-on-signal-numbers-in-devio.c.patch +++ b/usb/usb-remove-restrictions-on-signal-numbers-in-devio.c.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c -@@ -979,9 +979,6 @@ static int proc_do_submiturb(struct dev_ +@@ -981,9 +981,6 @@ static int proc_do_submiturb(struct dev_ return -EINVAL; if (!uurb->buffer) return -EINVAL; @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!(uurb->type == USBDEVFS_URB_TYPE_CONTROL && (uurb->endpoint & ~USB_ENDPOINT_DIR_MASK) == 0)) { ifnum = findintfep(ps->dev, uurb->endpoint); -@@ -1399,8 +1396,6 @@ static int proc_disconnectsignal(struct +@@ -1401,8 +1398,6 @@ static int proc_disconnectsignal(struct if (copy_from_user(&ds, arg, sizeof(ds))) return -EFAULT; diff --git a/usb/usb-serial-fix-up-urb-status-usage.patch b/usb/usb-serial-fix-up-urb-status-usage.patch index e79c0396c0f2ab..6f9f56c0b0142f 100644 --- a/usb/usb-serial-fix-up-urb-status-usage.patch +++ b/usb/usb-serial-fix-up-urb-status-usage.patch @@ -311,7 +311,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } if ((&mos7840_port->control_urb)) { dbg("%s", "Shutdown control read\n"); -@@ -2042,14 +2052,14 @@ static void mos7840_change_port_settings +@@ -2043,14 +2053,14 @@ static void mos7840_change_port_settings Data = 0x0c; mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data); @@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } wake_up(&mos7840_port->delta_msr_wait); -@@ -2116,12 +2126,14 @@ static void mos7840_set_termios(struct t +@@ -2117,12 +2127,14 @@ static void mos7840_set_termios(struct t return; } diff --git a/usb/usb-storage-make-the-quirks-module-parameter-writable.patch b/usb/usb-storage-make-the-quirks-module-parameter-writable.patch index 53ea4dbf4e237f..4a8ac66bad2b3e 100644 --- a/usb/usb-storage-make-the-quirks-module-parameter-writable.patch +++ b/usb/usb-storage-make-the-quirks-module-parameter-writable.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2327,14 +2327,21 @@ and is between 256 and 4096 characters. +@@ -2385,14 +2385,21 @@ and is between 256 and 4096 characters. and Product ID values (4-digit hex numbers) and Flags is a set of characters, each corresponding to a common usb-storage quirk flag as follows: diff --git a/usb/usb-usb-storage-add-quirks-module-parameter.patch b/usb/usb-usb-storage-add-quirks-module-parameter.patch index 0075c0142fb60d..ad03824016e4cc 100644 --- a/usb/usb-usb-storage-add-quirks-module-parameter.patch +++ b/usb/usb-usb-storage-add-quirks-module-parameter.patch @@ -29,15 +29,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -90,6 +90,7 @@ parameter is applicable: - SWSUSP Software suspend (hibernation) is enabled. +@@ -91,6 +91,7 @@ parameter is applicable: SUSPEND System suspend states are enabled. + FTRACE Function tracing enabled. TS Appropriate touchscreen support is enabled. + UMS USB Mass Storage support is enabled. USB USB support is enabled. USBHID USB Human Interface Device support is enabled. V4L Video For Linux support is enabled. -@@ -2314,6 +2315,34 @@ and is between 256 and 4096 characters. +@@ -2372,6 +2373,34 @@ and is between 256 and 4096 characters. usbhid.mousepoll= [USBHID] The interval which mice are to be polled at. diff --git a/usb/usb-wusb-annotate-association-types-withe-proper-endianness.patch b/usb/usb-wusb-annotate-association-types-withe-proper-endianness.patch index bc6e67b9c2d308..295383cd02f62b 100644 --- a/usb/usb-wusb-annotate-association-types-withe-proper-endianness.patch +++ b/usb/usb-wusb-annotate-association-types-withe-proper-endianness.patch @@ -35,15 +35,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/wusbcore/rh.c +++ b/drivers/usb/wusbcore/rh.c -@@ -352,7 +352,7 @@ static int wusbhc_rh_get_port_status(str +@@ -326,7 +326,7 @@ static int wusbhc_rh_clear_port_feat(str + static int wusbhc_rh_get_port_status(struct wusbhc *wusbhc, u16 port_idx, u32 *_buf, u16 wLength) { - int result = -EINVAL; - u16 *buf = (u16 *) _buf; + __le16 *buf = (__le16 *)_buf; - d_fnstart(1, wusbhc->dev, "(wusbhc %p port_idx %u wLength %u)\n", - wusbhc, port_idx, wLength); + if (port_idx > wusbhc->ports_max) + return -EINVAL; --- a/include/linux/usb/association.h +++ b/include/linux/usb/association.h @@ -28,17 +28,17 @@ struct wusb_am_attr { diff --git a/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch b/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch index 3dc4bee118d850..7914d7b5d9a3ae 100644 --- a/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch +++ b/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/Kbuild +++ b/include/linux/Kbuild -@@ -375,3 +375,5 @@ unifdef-y += xattr.h +@@ -376,3 +376,5 @@ unifdef-y += xattr.h unifdef-y += xfrm.h objhdr-y += version.h diff --git a/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch b/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch index 9a720a01d7490e..a6171c780ad74f 100644 --- a/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch +++ b/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> D: Some smbfs fixes --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2300,6 +2300,14 @@ W: http://lists.sourceforge.net/mailman/ +@@ -2308,6 +2308,14 @@ W: http://lists.sourceforge.net/mailman/ W: http://ipw2200.sourceforge.net S: Supported @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> INTEL WIRELESS WIFI LINK (iwlwifi) P: Zhu Yi M: yi.zhu@intel.com -@@ -4713,6 +4721,14 @@ M: zaga@fly.cc.fer.hr +@@ -4741,6 +4749,14 @@ M: zaga@fly.cc.fer.hr L: linux-scsi@vger.kernel.org S: Maintained diff --git a/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch b/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch index bcbc6f164270c1..3b2419ce1bc048 100644 --- a/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch +++ b/usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch @@ -25,9 +25,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/DocBook/networking.tmpl +++ b/Documentation/DocBook/networking.tmpl -@@ -101,6 +101,14 @@ X!Enet/core/wireless.c - <sect1><title>Synchronous PPP</title> - !Edrivers/net/wan/syncppp.c +@@ -74,6 +74,14 @@ + !Enet/sunrpc/rpcb_clnt.c + !Enet/sunrpc/clnt.c </sect1> + <sect1><title>WiMAX</title> +!Enet/wimax/op-msg.c @@ -39,10 +39,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + </sect1> </chapter> - </book> + <chapter id="netdev"> --- a/net/Kconfig +++ b/net/Kconfig -@@ -251,6 +251,8 @@ source "net/ieee80211/Kconfig" +@@ -254,6 +254,8 @@ source "net/mac80211/Kconfig" endif # WIRELESS @@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/net/Makefile +++ b/net/Makefile -@@ -61,3 +61,4 @@ obj-$(CONFIG_NET_9P) += 9p/ +@@ -63,3 +63,4 @@ endif ifeq ($(CONFIG_NET),y) obj-$(CONFIG_SYSCTL) += sysctl_net.o endif @@ -1 +1 @@ -2.6.28 +2.6.28-git6 |