2011-02-16 12:58:04

by Rafał Miłecki

Subject: [PATCH 1/2] ssb: trivial: fix SPROM extract warning formatting

Signed-off-by: Rafał Miłecki <[email protected]>
---
drivers/ssb/pci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 158449e..127897c 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -641,7 +641,7 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
break;
default:
ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
- " revision %d detected. Will extract"
+ " revision %d detected. Will extract"
" v1\n", out->revision);
out->revision = 1;
sprom_extract_r123(out, in);
--
1.7.1

2011-02-16 22:21:00

by Michael Büsch

Subject: Re: [PATCH 1/2] ssb: trivial: fix SPROM extract warning formatting

On Wed, 2011-02-16 at 13:58 +0100, Rafał Miłecki wrote:
> Signed-off-by: Rafał Miłecki <[email protected]>
> ---
> drivers/ssb/pci.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
> index 158449e..127897c 100644
> --- a/drivers/ssb/pci.c
> +++ b/drivers/ssb/pci.c
> @@ -641,7 +641,7 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
> break;
> default:
> ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
> - " revision %d detected. Will extract"
> + " revision %d detected. Will extract"
> " v1\n", out->revision);
> out->revision = 1;
> sprom_extract_r123(out, in);

ack for those two patches.

--
Greetings Michael.

2011-02-16 12:58:13

by Rafał Miłecki

Subject: [PATCH 2/2] ssb: remove invalid define SSB_TMSLOW_PHYCLK

It was incorrectly introduced in d2730b2a6a019d14455556019d744ab051e6554b. We
have already fixed function to use correct define, but forgot remove old one.

Signed-off-by: Rafał Miłecki <[email protected]>
Cc: Gábor Stefanik <[email protected]>
---
include/linux/ssb/ssb_regs.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 489f7b6..01253c6 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -97,7 +97,6 @@
#define SSB_TMSLOW_RESET 0x00000001 /* Reset */
#define SSB_TMSLOW_REJECT_22 0x00000002 /* Reject (Backplane rev 2.2) */
#define SSB_TMSLOW_REJECT_23 0x00000004 /* Reject (Backplane rev 2.3) */
-#define SSB_TMSLOW_PHYCLK 0x00000010 /* MAC PHY Clock Control Enable */
#define SSB_TMSLOW_CLOCK 0x00010000 /* Clock Enable */
#define SSB_TMSLOW_FGC 0x00020000 /* Force Gated Clocks On */
#define SSB_TMSLOW_PE 0x40000000 /* Power Management Enable */
--
1.7.1