drivers: block: skd: remove skd_pci_info()
Subsystems (2)
PATCH 1/1 drivers: block: skd: remove skd_pci_info()
Change the call to skd_pci_info() to pcie_print_link_status(). pcie_print_link_status() can be used to print the link speed and the link width, skd_pci_info() does the same and hence it is removed.
---
v1 - Add call to pcie_print_link_status()
--- drivers/block/skd_main.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-)
drivers/block/skd_main.c +1 -32
@@ -3134,40 +3134,10 @@ static const struct pci_device_id skd_pci_tbl[] = {MODULE_DEVICE_TABLE (pci, skd_pci_tbl); -static char *skd_pci_info (struct skd_device *skdev,char *str) -{ -int pcie_reg; - -strcpy (str,"PCIe (" ); - pcie_reg =pci_find_capability (skdev->pdev,PCI_CAP_ID_EXP ); - -if (pcie_reg) { - -char lwstr[6 ]; -uint16_t pcie_lstat, lspeed, lwidth; - - pcie_reg +=0x12 ; -pci_read_config_word (skdev->pdev, pcie_reg, &pcie_lstat); - lspeed = pcie_lstat & (0xF ); - lwidth = (pcie_lstat &0x3F0 ) >>4 ; - -if (lspeed ==1 ) -strcat (str,"2.5GT/s " ); -else if (lspeed ==2 ) -strcat (str,"5.0GT/s " ); -else -strcat (str,"<unknown> " ); -snprintf (lwstr,sizeof (lwstr),"%dX)" , lwidth); -strcat (str, lwstr); - } -return str; -} -static int skd_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {int i;int rc =0 ; -char pci_str[32 ];struct skd_device *skdev; dev_dbg(&pdev->dev, "vendor=%04X device=%04x\n", pdev->vendor,
@@ -3201,8 +3171,7 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_regions; } -skd_pci_info (skdev, pci_str); -dev_info (&pdev->dev,"%s 64bit\n" , pci_str); +pcie_print_link_status (pdev);pci_set_master (pdev); rc =pci_enable_pcie_error_reporting (pdev);
Signature · 1 line
2.27.0
Quoted 58 lines · Puranjay Mohan
Change the call to
skd_pci_info()topcie_print_link_status().pcie_print_link_status()can be used to print the link speed and the link width,skd_pci_info()does the same and hence it is removed.Signed-off-by Puranjay Mohan <[email protected]>---
v1 - Add call topcie_print_link_status()--- drivers/block/skd_main.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-)drivers/block/skd_main.c +0
-30@@ -3134,40 +3134,10 @@ static const struct pci_device_id skd_pci_tbl[] = {MODULE_DEVICE_TABLE (pci, skd_pci_tbl); -static char *skd_pci_info (struct skd_device *skdev,char *str) -{ -int pcie_reg; - -strcpy (str,"PCIe (" ); - pcie_reg =pci_find_capability (skdev->pdev,PCI_CAP_ID_EXP ); - -if (pcie_reg) { - -char lwstr[6 ]; -uint16_t pcie_lstat, lspeed, lwidth; - - pcie_reg +=0x12 ; -pci_read_config_word (skdev->pdev, pcie_reg, &pcie_lstat); - lspeed = pcie_lstat & (0xF ); - lwidth = (pcie_lstat &0x3F0 ) >>4 ; - -if (lspeed ==1 ) -strcat (str,"2.5GT/s " ); -else if (lspeed ==2 ) -strcat (str,"5.0GT/s " ); -else -strcat (str,"<unknown> " ); -snprintf (lwstr,sizeof (lwstr),"%dX)" , lwidth); -strcat (str, lwstr); - } -return str; -} -static int skd_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {int i;int rc =0 ; -char pci_str[32 ];struct skd_device *skdev; dev_dbg(&pdev->dev, "vendor=%04X device=%04x\n", pdev->vendor,
drivers/block/skd_main.c static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 3177
Quoted 9 lines
drivers/block/skd_main.c +1
-2@@ -3201,8 +3171,7 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_regions; } -skd_pci_info (skdev, pci_str); -dev_info (&pdev->dev,"%s 64bit\n" , pci_str); +pcie_print_link_status (pdev);pci_set_master (pdev); rc =pci_enable_pcie_error_reporting (pdev);
Note: V1 of this patch was the one I commented on. This one should thus be V2.
In any case, this looks OK to me.
Signature · 2 lines
Damien Le Moal Western Digital Research