diff for duplicates of <200801010117.54411.mboton@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 25f32e3..b4abd93 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ This is just this patch (http://lkml.org/lkml/2007/7/1/51) but adapted to the 'b44' ssb driver. -Signed-off-by: Miguel Bot=C3=B3n <mboton@gmail.com> +Signed-off-by: Miguel Botón <mboton@gmail.com> diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 49e9172..ea2a2b5 100644 @@ -13,27 +13,27 @@ index 49e9172..ea2a2b5 100644 #define B44_PARTIAL_RESET 3 +#define B44_CHIP_RESET_FULL 4 +#define B44_CHIP_RESET_PARTIAL 5 -=20 + static void b44_init_hw(struct b44 *, int); -=20 + @@ -1259,7 +1261,7 @@ static void b44_clear_stats(struct b44 *bp) } -=20 + /* bp->lock is held. */ -static void b44_chip_reset(struct b44 *bp) +static void b44_chip_reset(struct b44 *bp, int reset_kind) { - struct ssb_device *sdev =3D bp->sdev; -=20 + struct ssb_device *sdev = bp->sdev; + @@ -1281,6 +1283,13 @@ static void b44_chip_reset(struct b44 *bp) ssb_device_enable(bp->sdev, 0); b44_clear_stats(bp); -=20 + + /* + * Don't enable PHY if we are doing a partial reset + * we are probably going to power down + */ -+ if (reset_kind =3D=3D B44_CHIP_RESET_PARTIAL) ++ if (reset_kind == B44_CHIP_RESET_PARTIAL) + return; + switch (sdev->bus->bustype) { @@ -53,21 +53,19 @@ index 49e9172..ea2a2b5 100644 + * part of it. This has to be done _after_ we shut down the PHY */ + b44_chip_reset(bp, B44_CHIP_RESET_PARTIAL); } -=20 + /* bp->lock is held. */ -@@ -1365,7 +1381,7 @@ static void b44_init_hw(struct b44 *bp, int reset= -_kind) +@@ -1365,7 +1381,7 @@ static void b44_init_hw(struct b44 *bp, int reset_kind) { u32 val; -=20 + - b44_chip_reset(bp); + b44_chip_reset(bp, B44_CHIP_RESET_FULL); - if (reset_kind =3D=3D B44_FULL_RESET) { + if (reset_kind == B44_FULL_RESET) { b44_phy_reset(bp); b44_setup_phy(bp); @@ -1422,7 +1438,7 @@ static int b44_open(struct net_device *dev) - err =3D request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, = -dev); + err = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev); if (unlikely(err < 0)) { napi_disable(&bp->napi); - b44_chip_reset(bp); @@ -75,39 +73,31 @@ dev); b44_free_rings(bp); b44_free_consistent(bp); goto out; -@@ -2188,7 +2204,7 @@ static int __devinit b44_init_one(struct ssb_devi= -ce *sdev, +@@ -2188,7 +2204,7 @@ static int __devinit b44_init_one(struct ssb_device *sdev, /* Chip reset provides power to the b44 MAC & PCI cores, which * is necessary for MAC register access. */ - b44_chip_reset(bp); + b44_chip_reset(bp, B44_CHIP_RESET_FULL); -=20 + printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %s\n", dev->name, print_mac(mac, dev->dev_addr)); -@@ -2212,6 +2228,7 @@ static void __devexit b44_remove_one(struct ssb_d= -evice *sdev) +@@ -2212,6 +2228,7 @@ static void __devexit b44_remove_one(struct ssb_device *sdev) unregister_netdev(dev); ssb_bus_may_powerdown(sdev->bus); free_netdev(dev); + ssb_pcihost_set_power_state(sdev, PCI_D3hot); ssb_set_drvdata(sdev, NULL); } -=20 -@@ -2240,6 +2257,7 @@ static int b44_suspend(struct ssb_device *sdev, p= -m_message_t state) + +@@ -2240,6 +2257,7 @@ static int b44_suspend(struct ssb_device *sdev, pm_message_t state) b44_setup_wol(bp); } -=20 + + ssb_pcihost_set_power_state(sdev, PCI_D3hot); return 0; } -=20 + ---=20 - Miguel Bot=C3=B3n -- -To unsubscribe from this list: send the line "unsubscribe linux-wireles= -s" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +-- + Miguel Botón diff --git a/a/content_digest b/N1/content_digest index 83882ed..778a092 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,7 +10,7 @@ "This is just this patch (http://lkml.org/lkml/2007/7/1/51) but adapted\n" "to the 'b44' ssb driver.\n" "\n" - "Signed-off-by: Miguel Bot=C3=B3n <mboton@gmail.com>\n" + "Signed-off-by: Miguel Bot\303\263n <mboton@gmail.com>\n" "\n" "diff --git a/drivers/net/b44.c b/drivers/net/b44.c\n" "index 49e9172..ea2a2b5 100644\n" @@ -22,27 +22,27 @@ " #define B44_PARTIAL_RESET\t3\n" "+#define B44_CHIP_RESET_FULL\t4\n" "+#define B44_CHIP_RESET_PARTIAL\t5\n" - "=20\n" + " \n" " static void b44_init_hw(struct b44 *, int);\n" - "=20\n" + " \n" "@@ -1259,7 +1261,7 @@ static void b44_clear_stats(struct b44 *bp)\n" " }\n" - "=20\n" + " \n" " /* bp->lock is held. */\n" "-static void b44_chip_reset(struct b44 *bp)\n" "+static void b44_chip_reset(struct b44 *bp, int reset_kind)\n" " {\n" - " \tstruct ssb_device *sdev =3D bp->sdev;\n" - "=20\n" + " \tstruct ssb_device *sdev = bp->sdev;\n" + " \n" "@@ -1281,6 +1283,13 @@ static void b44_chip_reset(struct b44 *bp)\n" " \tssb_device_enable(bp->sdev, 0);\n" " \tb44_clear_stats(bp);\n" - "=20\n" + " \n" "+\t/*\n" "+\t * Don't enable PHY if we are doing a partial reset\n" "+\t * we are probably going to power down\n" "+\t */\n" - "+\tif (reset_kind =3D=3D B44_CHIP_RESET_PARTIAL)\n" + "+\tif (reset_kind == B44_CHIP_RESET_PARTIAL)\n" "+\t\treturn;\n" "+\n" " \tswitch (sdev->bus->bustype) {\n" @@ -62,21 +62,19 @@ "+\t * part of it. This has to be done _after_ we shut down the PHY */\n" "+\tb44_chip_reset(bp, B44_CHIP_RESET_PARTIAL);\n" " }\n" - "=20\n" + " \n" " /* bp->lock is held. */\n" - "@@ -1365,7 +1381,7 @@ static void b44_init_hw(struct b44 *bp, int reset=\n" - "_kind)\n" + "@@ -1365,7 +1381,7 @@ static void b44_init_hw(struct b44 *bp, int reset_kind)\n" " {\n" " \tu32 val;\n" - "=20\n" + " \n" "-\tb44_chip_reset(bp);\n" "+\tb44_chip_reset(bp, B44_CHIP_RESET_FULL);\n" - " \tif (reset_kind =3D=3D B44_FULL_RESET) {\n" + " \tif (reset_kind == B44_FULL_RESET) {\n" " \t\tb44_phy_reset(bp);\n" " \t\tb44_setup_phy(bp);\n" "@@ -1422,7 +1438,7 @@ static int b44_open(struct net_device *dev)\n" - " \terr =3D request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, =\n" - "dev);\n" + " \terr = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);\n" " \tif (unlikely(err < 0)) {\n" " \t\tnapi_disable(&bp->napi);\n" "-\t\tb44_chip_reset(bp);\n" @@ -84,41 +82,33 @@ " \t\tb44_free_rings(bp);\n" " \t\tb44_free_consistent(bp);\n" " \t\tgoto out;\n" - "@@ -2188,7 +2204,7 @@ static int __devinit b44_init_one(struct ssb_devi=\n" - "ce *sdev,\n" + "@@ -2188,7 +2204,7 @@ static int __devinit b44_init_one(struct ssb_device *sdev,\n" " \t/* Chip reset provides power to the b44 MAC & PCI cores, which\n" " \t * is necessary for MAC register access.\n" " \t */\n" "-\tb44_chip_reset(bp);\n" "+\tb44_chip_reset(bp, B44_CHIP_RESET_FULL);\n" - "=20\n" + " \n" " \tprintk(KERN_INFO \"%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %s\\n\",\n" " \t dev->name, print_mac(mac, dev->dev_addr));\n" - "@@ -2212,6 +2228,7 @@ static void __devexit b44_remove_one(struct ssb_d=\n" - "evice *sdev)\n" + "@@ -2212,6 +2228,7 @@ static void __devexit b44_remove_one(struct ssb_device *sdev)\n" " \tunregister_netdev(dev);\n" " \tssb_bus_may_powerdown(sdev->bus);\n" " \tfree_netdev(dev);\n" "+\tssb_pcihost_set_power_state(sdev, PCI_D3hot);\n" " \tssb_set_drvdata(sdev, NULL);\n" " }\n" - "=20\n" - "@@ -2240,6 +2257,7 @@ static int b44_suspend(struct ssb_device *sdev, p=\n" - "m_message_t state)\n" + " \n" + "@@ -2240,6 +2257,7 @@ static int b44_suspend(struct ssb_device *sdev, pm_message_t state)\n" " \t\tb44_setup_wol(bp);\n" " \t}\n" - "=20\n" + " \n" "+\tssb_pcihost_set_power_state(sdev, PCI_D3hot);\n" " \treturn 0;\n" " }\n" - "=20\n" + " \n" "\n" - "--=20\n" - "\tMiguel Bot=C3=B3n\n" - "-\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-wireles=\n" - "s\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "-- \n" + "\tMiguel Bot\303\263n" -410c90cd158c5746bf228c36ab8bfff217be34229582f5bc7ab67143b367608a +11ff14b3731f41fc6656e65251b46e9cb9cd251ed43bffa3a254c025911ede64
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.