* [PATCH] PCI: imx6: Use "u32", not "uint32_t"
@ 2015-06-12 20:23 Bjorn Helgaas
2015-06-15 9:28 ` Zhu Richard
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Helgaas @ 2015-06-12 20:23 UTC (permalink / raw)
To: Richard Zhu, Lucas Stach
Cc: Marek Vasut, linux-pci, linux-arm-kernel, Troy Kisky
Use "u32", not "uint32_t", for consistency. Use "tmp", not "temp", for
consistency within the driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pci-imx6.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 2bbd38d..a032c01 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -354,7 +354,7 @@ static int imx6_pcie_wait_for_link(struct pcie_port *pp)
static int imx6_pcie_wait_for_speed_change(struct pcie_port *pp)
{
- uint32_t tmp;
+ u32 tmp;
unsigned int retries;
for (retries = 0; retries < 200; retries++)
@@ -379,7 +379,7 @@ static irqreturn_t imx6_pcie_msi_handler(int irq, void *arg)
static int imx6_pcie_start_link(struct pcie_port *pp)
{
struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
- uint32_t tmp;
+ u32 tmp;
int ret;
/*
@@ -450,19 +450,19 @@ static void imx6_pcie_host_init(struct pcie_port *pp)
static void imx6_pcie_reset_phy(struct pcie_port *pp)
{
- uint32_t temp;
+ u32 tmp;
- pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp);
- temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
- PHY_RX_OVRD_IN_LO_RX_PLL_EN);
- pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp);
+ pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
+ tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
+ PHY_RX_OVRD_IN_LO_RX_PLL_EN);
+ pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
usleep_range(2000, 3000);
- pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp);
- temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN |
+ pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
+ tmp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN |
PHY_RX_OVRD_IN_LO_RX_PLL_EN);
- pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp);
+ pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
}
static int imx6_pcie_link_up(struct pcie_port *pp)
^ permalink raw reply related [flat|nested] 2+ messages in thread* RE: [PATCH] PCI: imx6: Use "u32", not "uint32_t"
2015-06-12 20:23 [PATCH] PCI: imx6: Use "u32", not "uint32_t" Bjorn Helgaas
@ 2015-06-15 9:28 ` Zhu Richard
0 siblings, 0 replies; 2+ messages in thread
From: Zhu Richard @ 2015-06-15 9:28 UTC (permalink / raw)
To: Bjorn Helgaas, Lucas Stach
Cc: Marek Vasut, linux-pci, linux-arm-kernel, Troy Kisky
DQpUaGFua3MsIHRvIGxldCBpdCBjb25zaXN0ZW5jZS4NCg0KQWNrZWQtYnk6IFJpY2hhcmQgWmh1
IDxSaWNoYXJkLlpodUBmcmVlc2NhbGUuY29tPg0KDQpGcmVlc2NhbGUgTGludXggQlNQIHRlYW0N
CkJlc3QgUmVnYXJkcw0KUmljaGFyZCBaaHUNCg0KLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0N
CkZyb206IEJqb3JuIEhlbGdhYXMgW21haWx0bzpiaGVsZ2Fhc0Bnb29nbGUuY29tXSANClNlbnQ6
IFNhdHVyZGF5LCBKdW5lIDEzLCAyMDE1IDQ6MjQgQU0NClRvOiBaaHUgUmljaGFyZC1SNjUwMzc7
IEx1Y2FzIFN0YWNoDQpDYzogTWFyZWsgVmFzdXQ7IGxpbnV4LXBjaUB2Z2VyLmtlcm5lbC5vcmc7
IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZzsgVHJveSBLaXNreQ0KU3ViamVj
dDogW1BBVENIXSBQQ0k6IGlteDY6IFVzZSAidTMyIiwgbm90ICJ1aW50MzJfdCINCg0KVXNlICJ1
MzIiLCBub3QgInVpbnQzMl90IiwgZm9yIGNvbnNpc3RlbmN5LiAgVXNlICJ0bXAiLCBub3QgInRl
bXAiLCBmb3IgY29uc2lzdGVuY3kgd2l0aGluIHRoZSBkcml2ZXIuDQoNClNpZ25lZC1vZmYtYnk6
IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdvb2dsZS5jb20+DQotLS0NCiBkcml2ZXJzL3BjaS9o
b3N0L3BjaS1pbXg2LmMgfCAgIDIwICsrKysrKysrKystLS0tLS0tLS0tDQogMSBmaWxlIGNoYW5n
ZWQsIDEwIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9wY2kvaG9zdC9wY2ktaW14Ni5jIGIvZHJpdmVycy9wY2kvaG9zdC9wY2ktaW14Ni5jIGlu
ZGV4IDJiYmQzOGQuLmEwMzJjMDEgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL3BjaS9ob3N0L3BjaS1p
bXg2LmMNCisrKyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpLWlteDYuYw0KQEAgLTM1NCw3ICszNTQs
NyBAQCBzdGF0aWMgaW50IGlteDZfcGNpZV93YWl0X2Zvcl9saW5rKHN0cnVjdCBwY2llX3BvcnQg
KnBwKQ0KIA0KIHN0YXRpYyBpbnQgaW14Nl9wY2llX3dhaXRfZm9yX3NwZWVkX2NoYW5nZShzdHJ1
Y3QgcGNpZV9wb3J0ICpwcCkgIHsNCi0JdWludDMyX3QgdG1wOw0KKwl1MzIgdG1wOw0KIAl1bnNp
Z25lZCBpbnQgcmV0cmllczsNCiANCiAJZm9yIChyZXRyaWVzID0gMDsgcmV0cmllcyA8IDIwMDsg
cmV0cmllcysrKSBAQCAtMzc5LDcgKzM3OSw3IEBAIHN0YXRpYyBpcnFyZXR1cm5fdCBpbXg2X3Bj
aWVfbXNpX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqYXJnKSAgc3RhdGljIGludCBpbXg2X3BjaWVf
c3RhcnRfbGluayhzdHJ1Y3QgcGNpZV9wb3J0ICpwcCkgIHsNCiAJc3RydWN0IGlteDZfcGNpZSAq
aW14Nl9wY2llID0gdG9faW14Nl9wY2llKHBwKTsNCi0JdWludDMyX3QgdG1wOw0KKwl1MzIgdG1w
Ow0KIAlpbnQgcmV0Ow0KIA0KIAkvKg0KQEAgLTQ1MCwxOSArNDUwLDE5IEBAIHN0YXRpYyB2b2lk
IGlteDZfcGNpZV9ob3N0X2luaXQoc3RydWN0IHBjaWVfcG9ydCAqcHApDQogDQogc3RhdGljIHZv
aWQgaW14Nl9wY2llX3Jlc2V0X3BoeShzdHJ1Y3QgcGNpZV9wb3J0ICpwcCkgIHsNCi0JdWludDMy
X3QgdGVtcDsNCisJdTMyIHRtcDsNCiANCi0JcGNpZV9waHlfcmVhZChwcC0+ZGJpX2Jhc2UsIFBI
WV9SWF9PVlJEX0lOX0xPLCAmdGVtcCk7DQotCXRlbXAgfD0gKFBIWV9SWF9PVlJEX0lOX0xPX1JY
X0RBVEFfRU4gfA0KLQkJIFBIWV9SWF9PVlJEX0lOX0xPX1JYX1BMTF9FTik7DQotCXBjaWVfcGh5
X3dyaXRlKHBwLT5kYmlfYmFzZSwgUEhZX1JYX09WUkRfSU5fTE8sIHRlbXApOw0KKwlwY2llX3Bo
eV9yZWFkKHBwLT5kYmlfYmFzZSwgUEhZX1JYX09WUkRfSU5fTE8sICZ0bXApOw0KKwl0bXAgfD0g
KFBIWV9SWF9PVlJEX0lOX0xPX1JYX0RBVEFfRU4gfA0KKwkJUEhZX1JYX09WUkRfSU5fTE9fUlhf
UExMX0VOKTsNCisJcGNpZV9waHlfd3JpdGUocHAtPmRiaV9iYXNlLCBQSFlfUlhfT1ZSRF9JTl9M
TywgdG1wKTsNCiANCiAJdXNsZWVwX3JhbmdlKDIwMDAsIDMwMDApOw0KIA0KLQlwY2llX3BoeV9y
ZWFkKHBwLT5kYmlfYmFzZSwgUEhZX1JYX09WUkRfSU5fTE8sICZ0ZW1wKTsNCi0JdGVtcCAmPSB+
KFBIWV9SWF9PVlJEX0lOX0xPX1JYX0RBVEFfRU4gfA0KKwlwY2llX3BoeV9yZWFkKHBwLT5kYmlf
YmFzZSwgUEhZX1JYX09WUkRfSU5fTE8sICZ0bXApOw0KKwl0bXAgJj0gfihQSFlfUlhfT1ZSRF9J
Tl9MT19SWF9EQVRBX0VOIHwNCiAJCSAgUEhZX1JYX09WUkRfSU5fTE9fUlhfUExMX0VOKTsNCi0J
cGNpZV9waHlfd3JpdGUocHAtPmRiaV9iYXNlLCBQSFlfUlhfT1ZSRF9JTl9MTywgdGVtcCk7DQor
CXBjaWVfcGh5X3dyaXRlKHBwLT5kYmlfYmFzZSwgUEhZX1JYX09WUkRfSU5fTE8sIHRtcCk7DQog
fQ0KIA0KIHN0YXRpYyBpbnQgaW14Nl9wY2llX2xpbmtfdXAoc3RydWN0IHBjaWVfcG9ydCAqcHAp
DQoNCg==
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-15 10:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-12 20:23 [PATCH] PCI: imx6: Use "u32", not "uint32_t" Bjorn Helgaas
2015-06-15 9:28 ` Zhu Richard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).