Change in flashrom[master]: pcidev: Fix typo

[Martijn Berger (Code Review)]

Martijn Berger has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

pcidev: Fix typo

Fix typo

Change-Id: If70834715a51dea4111ba56e85df0680ed25c7a4
Signed-off-by: Martijn Berger 
---
M pcidev.c
M programmer.h
2 files changed, 3 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/39966/1

diff --git a/pcidev.c b/pcidev.c
index 973acde..38b9380 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -30,7 +30,7 @@
    TYPE_UNKNOWN
 };

-int pci_bar_nuber_from_offset(int offset)
+int pci_bar_number_from_offset(int offset)
 {
    switch (offset) {
    	case PCI_BASE_ADDRESS_0:
@@ -63,7 +63,7 @@

headertype = pci_read_byte(dev, PCI_HEADER_TYPE) & 0x7f;
    msg_pspew("PCI header type 0x%02x\n", headertype);
-	bar_number = pci_bar_nuber_from_offset(bar);
+	bar_number = pci_bar_number_from_offset(bar);

if (PCI_LIB_VERSION >= 0x030500 && bar_number > -1) {
    	addr = dev->base_addr[bar_number];
diff --git a/programmer.h b/programmer.h
index 5d4c1d7..42f646b 100644
--- a/programmer.h
+++ b/programmer.h
@@ -190,7 +190,7 @@
 // FIXME: This needs to be local, not global(?)
 extern struct pci_access *pacc;
 int pci_init_common(void);
-int pci_bar_nuber_from_offset(int offset);
+int pci_bar_number_from_offset(int offset);
 uintptr_t pcidev_readbar(struct pci_dev *dev, int bar);
 struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar);
 /* rpci_write_* are reversible writes. The original PCI config space register

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Patch Set 1: Code-Review+1

(2 comments)

https://review.coreboot.org/c/flashrom/+/39966/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/flashrom/+/39966/1//COMMIT_MSG@7 
PS1, Line 7: pcidev: Fix typo
Fix typo in function name

https://review.coreboot.org/c/flashrom/+/39966/1//COMMIT_MSG@9 
PS1, Line 9: Fix typo
Not needed.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Patch Set 1: Code-Review+1

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Patch Set 1: -Code-Review

This should be fixed in the parent change, CB:39965

[Martijn Berger (Code Review)]

Martijn Berger has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Patch Set 1:
> Patch Set 1: -Code-Review
>
> This should be fixed in the parent change, CB:39965

How do I do that ? 
I tried to squash / amend but I have not convinced Gerrit

[David Hendricks (Code Review)]

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Patch Set 1:
> Patch Set 1:
> > Patch Set 1: -Code-Review
> >
> > This should be fixed in the parent change, CB:39965
>
> How do I do that ? 
> I tried to squash / amend but I have not convinced Gerrit

Gerrit might be getting confused due to the Change-Id. Gerrit uses the Change-Id in the commit message to track the relationship between patches and assign them numbers. When you squash you need to remove the Change-Ids of patches you are squashing from whatever the resulting commit message is.

So in this case when you squash this patch into the the previous one in the chain (CB:39965) you need to remove "Change-Id: If70834715a51dea4111ba56e85df0680ed25c7a4" from the resulting commit message.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Patch Set 1:
> Patch Set 1:
> > Patch Set 1:
> > > Patch Set 1: -Code-Review
> > >
> > > This should be fixed in the parent change, CB:39965
> >
> > How do I do that ? 
> > I tried to squash / amend but I have not convinced Gerrit
>
> Gerrit might be getting confused due to the Change-Id. Gerrit uses the Change-Id in the commit message to track the relationship between patches and assign them numbers. When you squash you need to remove the Change-Ids of patches you are squashing from whatever the resulting commit message is.
>
> So in this case when you squash this patch into the the previous one in the chain (CB:39965) you need to remove "Change-Id: If70834715a51dea4111ba56e85df0680ed25c7a4" from the resulting commit message.

You can also use the 'fixup' operation in git rebase: it does the same as squash, but discards the commit message

[Martijn Berger (Code Review)]

Martijn Berger has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Abandoned

[Martijn Berger (Code Review)]

Martijn Berger has restored this change. ( https://review.coreboot.org/c/flashrom/+/39966 )

Change subject: pcidev: Fix typo
......................................................................

Restored