bcm47xx: Get rid of redundant 'else'
PATCH 1/2 bcm47xx: Get rid of redundant 'else'
In the snipped like
if (...) return ...; else
the 'else' is redundant. Get rid of it.
Signed-off-by Andy Shevchenko <[email protected]>
--- arch/mips/pci/pci-bcm47xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/mips/pci/pci-bcm47xx.c +1 -3
@@ -93,12 +93,10 @@ int pcibios_plat_dev_init(struct pci_dev *dev)#ifdef CONFIG_BCM47XX_SSB if (bcm47xx_bus_type ==BCM47XX_BUS_TYPE_SSB )return bcm47xx_pcibios_plat_dev_init_ssb (dev); - else#endif #ifdef CONFIG_BCM47XX_BCMA if (bcm47xx_bus_type ==BCM47XX_BUS_TYPE_BCMA )return bcm47xx_pcibios_plat_dev_init_bcma (dev); - else#endif -return 0 ; +return 0 ; }
Signature · 1 line
2.33.0
PATCH 2/2 bcm47xx: Replace printk(KERN_ALERT ... pci_devname(dev)) with pci_alert()
Replace printk(KERN_ALERT ... pci_devname(dev)) with pci_alert() which provides PCI device name in a unified way.
Signed-off-by Andy Shevchenko <[email protected]>
--- arch/mips/pci/pci-bcm47xx.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
arch/mips/pci/pci-bcm47xx.c +4 -8
@@ -41,8 +41,7 @@ static int bcm47xx_pcibios_plat_dev_init_ssb(struct pci_dev *dev) res =ssb_pcibios_plat_dev_init (dev);if (res <0 ) { -printk (KERN_ALERT "PCI: Failed to init device %s\n" , -pci_name (dev)); +pci_alert (dev,"PCI: Failed to init device\n" );return res; }
@@ -52,8 +51,7 @@ static int bcm47xx_pcibios_plat_dev_init_ssb(struct pci_dev *dev)/* IRQ-0 and IRQ-1 are software interrupts. */ if (res <2 ) { -printk (KERN_ALERT "PCI: Failed to map IRQ of device %s\n" , -pci_name (dev)); +pci_alert (dev,"PCI: Failed to map IRQ of device\n" );return res; }
@@ -69,8 +67,7 @@ static int bcm47xx_pcibios_plat_dev_init_bcma(struct pci_dev *dev) res =bcma_core_pci_plat_dev_init (dev);if (res <0 ) { -printk (KERN_ALERT "PCI: Failed to init device %s\n" , -pci_name (dev)); +pci_alert (dev,"PCI: Failed to init device\n" );return res; }
@@ -78,8 +75,7 @@ static int bcm47xx_pcibios_plat_dev_init_bcma(struct pci_dev *dev)/* IRQ-0 and IRQ-1 are software interrupts. */ if (res <2 ) { -printk (KERN_ALERT "PCI: Failed to map IRQ of device %s\n" , -pci_name (dev)); +pci_alert (dev,"PCI: Failed to map IRQ of device\n" );return res; }
Signature · 1 line
2.33.0
Re: [PATCH v1 2/2] bcm47xx: Replace printk(KERN_ALERT ... pci_devname(dev)) with pci_alert()
Quoted 7 lines · Andy Shevchenko
Replace printk(KERN_ALERT ...
pci_devname(dev)) withpci_alert()which provides PCI device name in a unified way.Signed-off-by Andy Shevchenko <[email protected]>--- arch/mips/pci/pci-bcm47xx.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 6 lines · Andy Shevchenko
In the snipped like
if (...) return ...; else
Quoted 6 lines
the 'else' is redundant. Get rid of it.
Signed-off-by Andy Shevchenko <[email protected]>--- arch/mips/pci/pci-bcm47xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]