diff options
author | Baoyou Xie <baoyou.xie@linaro.org> | 2016-09-25 01:44:55 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-09-26 20:35:51 -0400 |
commit | bd4b3e5c8adf2b9f601b46b917afac555be05688 (patch) | |
tree | de0005ee2cf04415f09c52c063589009c138050c /drivers/scsi/lpfc | |
parent | b32ece0ff70c30e59f16e9a8ffd05acc27298ba3 (diff) |
scsi: lpfc: Mark symbols static where possible
We get a few warnings when building kernel with W=1:
drivers/scsi/lpfc/lpfc_sli.c:5693:1: warning: no previous prototype for 'lpfc_set_features' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_sli.c:8972:1: warning: no previous prototype for 'lpfc_sli_calc_ring' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4621:1: warning: no previous prototype for 'lpfc_rdp_res_link_service' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4633:1: warning: no previous prototype for 'lpfc_rdp_res_sfp_desc' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4698:1: warning: no previous prototype for 'lpfc_rdp_res_link_error' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4727:1: warning: no previous prototype for 'lpfc_rdp_res_bbc_desc' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4752:1: warning: no previous prototype for 'lpfc_rdp_res_oed_temp_desc' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4780:1: warning: no previous prototype for 'lpfc_rdp_res_oed_voltage_desc' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4809:1: warning: no previous prototype for 'lpfc_rdp_res_oed_txbias_desc' [-Wmissing-prototypes]
drivers/scsi/lpfc/lpfc_els.c:4838:1: warning: no previous prototype for 'lpfc_rdp_res_oed_txpower_desc' [-Wmissing-prototypes]
....
In fact, these functions are only used in the file in which they are
declared and don't need a declaration, but can be made static. So this
patch marks these functions with 'static'.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_ct.c | 82 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 34 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_mbox.c | 4 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 4 |
4 files changed, 62 insertions, 62 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 63e48d4277b0..4ac03b16d17f 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c | |||
@@ -1535,7 +1535,7 @@ lpfc_fdmi_num_disc_check(struct lpfc_vport *vport) | |||
1535 | } | 1535 | } |
1536 | 1536 | ||
1537 | /* Routines for all individual HBA attributes */ | 1537 | /* Routines for all individual HBA attributes */ |
1538 | int | 1538 | static int |
1539 | lpfc_fdmi_hba_attr_wwnn(struct lpfc_vport *vport, struct lpfc_fdmi_attr_def *ad) | 1539 | lpfc_fdmi_hba_attr_wwnn(struct lpfc_vport *vport, struct lpfc_fdmi_attr_def *ad) |
1540 | { | 1540 | { |
1541 | struct lpfc_fdmi_attr_entry *ae; | 1541 | struct lpfc_fdmi_attr_entry *ae; |
@@ -1551,7 +1551,7 @@ lpfc_fdmi_hba_attr_wwnn(struct lpfc_vport *vport, struct lpfc_fdmi_attr_def *ad) | |||
1551 | ad->AttrType = cpu_to_be16(RHBA_NODENAME); | 1551 | ad->AttrType = cpu_to_be16(RHBA_NODENAME); |
1552 | return size; | 1552 | return size; |
1553 | } | 1553 | } |
1554 | int | 1554 | static int |
1555 | lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, | 1555 | lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, |
1556 | struct lpfc_fdmi_attr_def *ad) | 1556 | struct lpfc_fdmi_attr_def *ad) |
1557 | { | 1557 | { |
@@ -1573,7 +1573,7 @@ lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, | |||
1573 | return size; | 1573 | return size; |
1574 | } | 1574 | } |
1575 | 1575 | ||
1576 | int | 1576 | static int |
1577 | lpfc_fdmi_hba_attr_sn(struct lpfc_vport *vport, struct lpfc_fdmi_attr_def *ad) | 1577 | lpfc_fdmi_hba_attr_sn(struct lpfc_vport *vport, struct lpfc_fdmi_attr_def *ad) |
1578 | { | 1578 | { |
1579 | struct lpfc_hba *phba = vport->phba; | 1579 | struct lpfc_hba *phba = vport->phba; |
@@ -1594,7 +1594,7 @@ lpfc_fdmi_hba_attr_sn(struct lpfc_vport *vport, struct lpfc_fdmi_attr_def *ad) | |||
1594 | return size; | 1594 | return size; |
1595 | } | 1595 | } |
1596 | 1596 | ||
1597 | int | 1597 | static int |
1598 | lpfc_fdmi_hba_attr_model(struct lpfc_vport *vport, | 1598 | lpfc_fdmi_hba_attr_model(struct lpfc_vport *vport, |
1599 | struct lpfc_fdmi_attr_def *ad) | 1599 | struct lpfc_fdmi_attr_def *ad) |
1600 | { | 1600 | { |
@@ -1615,7 +1615,7 @@ lpfc_fdmi_hba_attr_model(struct lpfc_vport *vport, | |||
1615 | return size; | 1615 | return size; |
1616 | } | 1616 | } |
1617 | 1617 | ||
1618 | int | 1618 | static int |
1619 | lpfc_fdmi_hba_attr_description(struct lpfc_vport *vport, | 1619 | lpfc_fdmi_hba_attr_description(struct lpfc_vport *vport, |
1620 | struct lpfc_fdmi_attr_def *ad) | 1620 | struct lpfc_fdmi_attr_def *ad) |
1621 | { | 1621 | { |
@@ -1637,7 +1637,7 @@ lpfc_fdmi_hba_attr_description(struct lpfc_vport *vport, | |||
1637 | return size; | 1637 | return size; |
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | int | 1640 | static int |
1641 | lpfc_fdmi_hba_attr_hdw_ver(struct lpfc_vport *vport, | 1641 | lpfc_fdmi_hba_attr_hdw_ver(struct lpfc_vport *vport, |
1642 | struct lpfc_fdmi_attr_def *ad) | 1642 | struct lpfc_fdmi_attr_def *ad) |
1643 | { | 1643 | { |
@@ -1669,7 +1669,7 @@ lpfc_fdmi_hba_attr_hdw_ver(struct lpfc_vport *vport, | |||
1669 | return size; | 1669 | return size; |
1670 | } | 1670 | } |
1671 | 1671 | ||
1672 | int | 1672 | static int |
1673 | lpfc_fdmi_hba_attr_drvr_ver(struct lpfc_vport *vport, | 1673 | lpfc_fdmi_hba_attr_drvr_ver(struct lpfc_vport *vport, |
1674 | struct lpfc_fdmi_attr_def *ad) | 1674 | struct lpfc_fdmi_attr_def *ad) |
1675 | { | 1675 | { |
@@ -1690,7 +1690,7 @@ lpfc_fdmi_hba_attr_drvr_ver(struct lpfc_vport *vport, | |||
1690 | return size; | 1690 | return size; |
1691 | } | 1691 | } |
1692 | 1692 | ||
1693 | int | 1693 | static int |
1694 | lpfc_fdmi_hba_attr_rom_ver(struct lpfc_vport *vport, | 1694 | lpfc_fdmi_hba_attr_rom_ver(struct lpfc_vport *vport, |
1695 | struct lpfc_fdmi_attr_def *ad) | 1695 | struct lpfc_fdmi_attr_def *ad) |
1696 | { | 1696 | { |
@@ -1715,7 +1715,7 @@ lpfc_fdmi_hba_attr_rom_ver(struct lpfc_vport *vport, | |||
1715 | return size; | 1715 | return size; |
1716 | } | 1716 | } |
1717 | 1717 | ||
1718 | int | 1718 | static int |
1719 | lpfc_fdmi_hba_attr_fmw_ver(struct lpfc_vport *vport, | 1719 | lpfc_fdmi_hba_attr_fmw_ver(struct lpfc_vport *vport, |
1720 | struct lpfc_fdmi_attr_def *ad) | 1720 | struct lpfc_fdmi_attr_def *ad) |
1721 | { | 1721 | { |
@@ -1736,7 +1736,7 @@ lpfc_fdmi_hba_attr_fmw_ver(struct lpfc_vport *vport, | |||
1736 | return size; | 1736 | return size; |
1737 | } | 1737 | } |
1738 | 1738 | ||
1739 | int | 1739 | static int |
1740 | lpfc_fdmi_hba_attr_os_ver(struct lpfc_vport *vport, | 1740 | lpfc_fdmi_hba_attr_os_ver(struct lpfc_vport *vport, |
1741 | struct lpfc_fdmi_attr_def *ad) | 1741 | struct lpfc_fdmi_attr_def *ad) |
1742 | { | 1742 | { |
@@ -1759,7 +1759,7 @@ lpfc_fdmi_hba_attr_os_ver(struct lpfc_vport *vport, | |||
1759 | return size; | 1759 | return size; |
1760 | } | 1760 | } |
1761 | 1761 | ||
1762 | int | 1762 | static int |
1763 | lpfc_fdmi_hba_attr_ct_len(struct lpfc_vport *vport, | 1763 | lpfc_fdmi_hba_attr_ct_len(struct lpfc_vport *vport, |
1764 | struct lpfc_fdmi_attr_def *ad) | 1764 | struct lpfc_fdmi_attr_def *ad) |
1765 | { | 1765 | { |
@@ -1775,7 +1775,7 @@ lpfc_fdmi_hba_attr_ct_len(struct lpfc_vport *vport, | |||
1775 | return size; | 1775 | return size; |
1776 | } | 1776 | } |
1777 | 1777 | ||
1778 | int | 1778 | static int |
1779 | lpfc_fdmi_hba_attr_symbolic_name(struct lpfc_vport *vport, | 1779 | lpfc_fdmi_hba_attr_symbolic_name(struct lpfc_vport *vport, |
1780 | struct lpfc_fdmi_attr_def *ad) | 1780 | struct lpfc_fdmi_attr_def *ad) |
1781 | { | 1781 | { |
@@ -1794,7 +1794,7 @@ lpfc_fdmi_hba_attr_symbolic_name(struct lpfc_vport *vport, | |||
1794 | return size; | 1794 | return size; |
1795 | } | 1795 | } |
1796 | 1796 | ||
1797 | int | 1797 | static int |
1798 | lpfc_fdmi_hba_attr_vendor_info(struct lpfc_vport *vport, | 1798 | lpfc_fdmi_hba_attr_vendor_info(struct lpfc_vport *vport, |
1799 | struct lpfc_fdmi_attr_def *ad) | 1799 | struct lpfc_fdmi_attr_def *ad) |
1800 | { | 1800 | { |
@@ -1811,7 +1811,7 @@ lpfc_fdmi_hba_attr_vendor_info(struct lpfc_vport *vport, | |||
1811 | return size; | 1811 | return size; |
1812 | } | 1812 | } |
1813 | 1813 | ||
1814 | int | 1814 | static int |
1815 | lpfc_fdmi_hba_attr_num_ports(struct lpfc_vport *vport, | 1815 | lpfc_fdmi_hba_attr_num_ports(struct lpfc_vport *vport, |
1816 | struct lpfc_fdmi_attr_def *ad) | 1816 | struct lpfc_fdmi_attr_def *ad) |
1817 | { | 1817 | { |
@@ -1828,7 +1828,7 @@ lpfc_fdmi_hba_attr_num_ports(struct lpfc_vport *vport, | |||
1828 | return size; | 1828 | return size; |
1829 | } | 1829 | } |
1830 | 1830 | ||
1831 | int | 1831 | static int |
1832 | lpfc_fdmi_hba_attr_fabric_wwnn(struct lpfc_vport *vport, | 1832 | lpfc_fdmi_hba_attr_fabric_wwnn(struct lpfc_vport *vport, |
1833 | struct lpfc_fdmi_attr_def *ad) | 1833 | struct lpfc_fdmi_attr_def *ad) |
1834 | { | 1834 | { |
@@ -1846,7 +1846,7 @@ lpfc_fdmi_hba_attr_fabric_wwnn(struct lpfc_vport *vport, | |||
1846 | return size; | 1846 | return size; |
1847 | } | 1847 | } |
1848 | 1848 | ||
1849 | int | 1849 | static int |
1850 | lpfc_fdmi_hba_attr_bios_ver(struct lpfc_vport *vport, | 1850 | lpfc_fdmi_hba_attr_bios_ver(struct lpfc_vport *vport, |
1851 | struct lpfc_fdmi_attr_def *ad) | 1851 | struct lpfc_fdmi_attr_def *ad) |
1852 | { | 1852 | { |
@@ -1867,7 +1867,7 @@ lpfc_fdmi_hba_attr_bios_ver(struct lpfc_vport *vport, | |||
1867 | return size; | 1867 | return size; |
1868 | } | 1868 | } |
1869 | 1869 | ||
1870 | int | 1870 | static int |
1871 | lpfc_fdmi_hba_attr_bios_state(struct lpfc_vport *vport, | 1871 | lpfc_fdmi_hba_attr_bios_state(struct lpfc_vport *vport, |
1872 | struct lpfc_fdmi_attr_def *ad) | 1872 | struct lpfc_fdmi_attr_def *ad) |
1873 | { | 1873 | { |
@@ -1884,7 +1884,7 @@ lpfc_fdmi_hba_attr_bios_state(struct lpfc_vport *vport, | |||
1884 | return size; | 1884 | return size; |
1885 | } | 1885 | } |
1886 | 1886 | ||
1887 | int | 1887 | static int |
1888 | lpfc_fdmi_hba_attr_vendor_id(struct lpfc_vport *vport, | 1888 | lpfc_fdmi_hba_attr_vendor_id(struct lpfc_vport *vport, |
1889 | struct lpfc_fdmi_attr_def *ad) | 1889 | struct lpfc_fdmi_attr_def *ad) |
1890 | { | 1890 | { |
@@ -1906,7 +1906,7 @@ lpfc_fdmi_hba_attr_vendor_id(struct lpfc_vport *vport, | |||
1906 | } | 1906 | } |
1907 | 1907 | ||
1908 | /* Routines for all individual PORT attributes */ | 1908 | /* Routines for all individual PORT attributes */ |
1909 | int | 1909 | static int |
1910 | lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport, | 1910 | lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport, |
1911 | struct lpfc_fdmi_attr_def *ad) | 1911 | struct lpfc_fdmi_attr_def *ad) |
1912 | { | 1912 | { |
@@ -1925,7 +1925,7 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport, | |||
1925 | return size; | 1925 | return size; |
1926 | } | 1926 | } |
1927 | 1927 | ||
1928 | int | 1928 | static int |
1929 | lpfc_fdmi_port_attr_support_speed(struct lpfc_vport *vport, | 1929 | lpfc_fdmi_port_attr_support_speed(struct lpfc_vport *vport, |
1930 | struct lpfc_fdmi_attr_def *ad) | 1930 | struct lpfc_fdmi_attr_def *ad) |
1931 | { | 1931 | { |
@@ -1975,7 +1975,7 @@ lpfc_fdmi_port_attr_support_speed(struct lpfc_vport *vport, | |||
1975 | return size; | 1975 | return size; |
1976 | } | 1976 | } |
1977 | 1977 | ||
1978 | int | 1978 | static int |
1979 | lpfc_fdmi_port_attr_speed(struct lpfc_vport *vport, | 1979 | lpfc_fdmi_port_attr_speed(struct lpfc_vport *vport, |
1980 | struct lpfc_fdmi_attr_def *ad) | 1980 | struct lpfc_fdmi_attr_def *ad) |
1981 | { | 1981 | { |
@@ -2039,7 +2039,7 @@ lpfc_fdmi_port_attr_speed(struct lpfc_vport *vport, | |||
2039 | return size; | 2039 | return size; |
2040 | } | 2040 | } |
2041 | 2041 | ||
2042 | int | 2042 | static int |
2043 | lpfc_fdmi_port_attr_max_frame(struct lpfc_vport *vport, | 2043 | lpfc_fdmi_port_attr_max_frame(struct lpfc_vport *vport, |
2044 | struct lpfc_fdmi_attr_def *ad) | 2044 | struct lpfc_fdmi_attr_def *ad) |
2045 | { | 2045 | { |
@@ -2059,7 +2059,7 @@ lpfc_fdmi_port_attr_max_frame(struct lpfc_vport *vport, | |||
2059 | return size; | 2059 | return size; |
2060 | } | 2060 | } |
2061 | 2061 | ||
2062 | int | 2062 | static int |
2063 | lpfc_fdmi_port_attr_os_devname(struct lpfc_vport *vport, | 2063 | lpfc_fdmi_port_attr_os_devname(struct lpfc_vport *vport, |
2064 | struct lpfc_fdmi_attr_def *ad) | 2064 | struct lpfc_fdmi_attr_def *ad) |
2065 | { | 2065 | { |
@@ -2081,7 +2081,7 @@ lpfc_fdmi_port_attr_os_devname(struct lpfc_vport *vport, | |||
2081 | return size; | 2081 | return size; |
2082 | } | 2082 | } |
2083 | 2083 | ||
2084 | int | 2084 | static int |
2085 | lpfc_fdmi_port_attr_host_name(struct lpfc_vport *vport, | 2085 | lpfc_fdmi_port_attr_host_name(struct lpfc_vport *vport, |
2086 | struct lpfc_fdmi_attr_def *ad) | 2086 | struct lpfc_fdmi_attr_def *ad) |
2087 | { | 2087 | { |
@@ -2102,7 +2102,7 @@ lpfc_fdmi_port_attr_host_name(struct lpfc_vport *vport, | |||
2102 | return size; | 2102 | return size; |
2103 | } | 2103 | } |
2104 | 2104 | ||
2105 | int | 2105 | static int |
2106 | lpfc_fdmi_port_attr_wwnn(struct lpfc_vport *vport, | 2106 | lpfc_fdmi_port_attr_wwnn(struct lpfc_vport *vport, |
2107 | struct lpfc_fdmi_attr_def *ad) | 2107 | struct lpfc_fdmi_attr_def *ad) |
2108 | { | 2108 | { |
@@ -2120,7 +2120,7 @@ lpfc_fdmi_port_attr_wwnn(struct lpfc_vport *vport, | |||
2120 | return size; | 2120 | return size; |
2121 | } | 2121 | } |
2122 | 2122 | ||
2123 | int | 2123 | static int |
2124 | lpfc_fdmi_port_attr_wwpn(struct lpfc_vport *vport, | 2124 | lpfc_fdmi_port_attr_wwpn(struct lpfc_vport *vport, |
2125 | struct lpfc_fdmi_attr_def *ad) | 2125 | struct lpfc_fdmi_attr_def *ad) |
2126 | { | 2126 | { |
@@ -2138,7 +2138,7 @@ lpfc_fdmi_port_attr_wwpn(struct lpfc_vport *vport, | |||
2138 | return size; | 2138 | return size; |
2139 | } | 2139 | } |
2140 | 2140 | ||
2141 | int | 2141 | static int |
2142 | lpfc_fdmi_port_attr_symbolic_name(struct lpfc_vport *vport, | 2142 | lpfc_fdmi_port_attr_symbolic_name(struct lpfc_vport *vport, |
2143 | struct lpfc_fdmi_attr_def *ad) | 2143 | struct lpfc_fdmi_attr_def *ad) |
2144 | { | 2144 | { |
@@ -2156,7 +2156,7 @@ lpfc_fdmi_port_attr_symbolic_name(struct lpfc_vport *vport, | |||
2156 | return size; | 2156 | return size; |
2157 | } | 2157 | } |
2158 | 2158 | ||
2159 | int | 2159 | static int |
2160 | lpfc_fdmi_port_attr_port_type(struct lpfc_vport *vport, | 2160 | lpfc_fdmi_port_attr_port_type(struct lpfc_vport *vport, |
2161 | struct lpfc_fdmi_attr_def *ad) | 2161 | struct lpfc_fdmi_attr_def *ad) |
2162 | { | 2162 | { |
@@ -2175,7 +2175,7 @@ lpfc_fdmi_port_attr_port_type(struct lpfc_vport *vport, | |||
2175 | return size; | 2175 | return size; |
2176 | } | 2176 | } |
2177 | 2177 | ||
2178 | int | 2178 | static int |
2179 | lpfc_fdmi_port_attr_class(struct lpfc_vport *vport, | 2179 | lpfc_fdmi_port_attr_class(struct lpfc_vport *vport, |
2180 | struct lpfc_fdmi_attr_def *ad) | 2180 | struct lpfc_fdmi_attr_def *ad) |
2181 | { | 2181 | { |
@@ -2190,7 +2190,7 @@ lpfc_fdmi_port_attr_class(struct lpfc_vport *vport, | |||
2190 | return size; | 2190 | return size; |
2191 | } | 2191 | } |
2192 | 2192 | ||
2193 | int | 2193 | static int |
2194 | lpfc_fdmi_port_attr_fabric_wwpn(struct lpfc_vport *vport, | 2194 | lpfc_fdmi_port_attr_fabric_wwpn(struct lpfc_vport *vport, |
2195 | struct lpfc_fdmi_attr_def *ad) | 2195 | struct lpfc_fdmi_attr_def *ad) |
2196 | { | 2196 | { |
@@ -2208,7 +2208,7 @@ lpfc_fdmi_port_attr_fabric_wwpn(struct lpfc_vport *vport, | |||
2208 | return size; | 2208 | return size; |
2209 | } | 2209 | } |
2210 | 2210 | ||
2211 | int | 2211 | static int |
2212 | lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport, | 2212 | lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport, |
2213 | struct lpfc_fdmi_attr_def *ad) | 2213 | struct lpfc_fdmi_attr_def *ad) |
2214 | { | 2214 | { |
@@ -2227,7 +2227,7 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport, | |||
2227 | return size; | 2227 | return size; |
2228 | } | 2228 | } |
2229 | 2229 | ||
2230 | int | 2230 | static int |
2231 | lpfc_fdmi_port_attr_port_state(struct lpfc_vport *vport, | 2231 | lpfc_fdmi_port_attr_port_state(struct lpfc_vport *vport, |
2232 | struct lpfc_fdmi_attr_def *ad) | 2232 | struct lpfc_fdmi_attr_def *ad) |
2233 | { | 2233 | { |
@@ -2243,7 +2243,7 @@ lpfc_fdmi_port_attr_port_state(struct lpfc_vport *vport, | |||
2243 | return size; | 2243 | return size; |
2244 | } | 2244 | } |
2245 | 2245 | ||
2246 | int | 2246 | static int |
2247 | lpfc_fdmi_port_attr_num_disc(struct lpfc_vport *vport, | 2247 | lpfc_fdmi_port_attr_num_disc(struct lpfc_vport *vport, |
2248 | struct lpfc_fdmi_attr_def *ad) | 2248 | struct lpfc_fdmi_attr_def *ad) |
2249 | { | 2249 | { |
@@ -2259,7 +2259,7 @@ lpfc_fdmi_port_attr_num_disc(struct lpfc_vport *vport, | |||
2259 | return size; | 2259 | return size; |
2260 | } | 2260 | } |
2261 | 2261 | ||
2262 | int | 2262 | static int |
2263 | lpfc_fdmi_port_attr_nportid(struct lpfc_vport *vport, | 2263 | lpfc_fdmi_port_attr_nportid(struct lpfc_vport *vport, |
2264 | struct lpfc_fdmi_attr_def *ad) | 2264 | struct lpfc_fdmi_attr_def *ad) |
2265 | { | 2265 | { |
@@ -2274,7 +2274,7 @@ lpfc_fdmi_port_attr_nportid(struct lpfc_vport *vport, | |||
2274 | return size; | 2274 | return size; |
2275 | } | 2275 | } |
2276 | 2276 | ||
2277 | int | 2277 | static int |
2278 | lpfc_fdmi_smart_attr_service(struct lpfc_vport *vport, | 2278 | lpfc_fdmi_smart_attr_service(struct lpfc_vport *vport, |
2279 | struct lpfc_fdmi_attr_def *ad) | 2279 | struct lpfc_fdmi_attr_def *ad) |
2280 | { | 2280 | { |
@@ -2295,7 +2295,7 @@ lpfc_fdmi_smart_attr_service(struct lpfc_vport *vport, | |||
2295 | return size; | 2295 | return size; |
2296 | } | 2296 | } |
2297 | 2297 | ||
2298 | int | 2298 | static int |
2299 | lpfc_fdmi_smart_attr_guid(struct lpfc_vport *vport, | 2299 | lpfc_fdmi_smart_attr_guid(struct lpfc_vport *vport, |
2300 | struct lpfc_fdmi_attr_def *ad) | 2300 | struct lpfc_fdmi_attr_def *ad) |
2301 | { | 2301 | { |
@@ -2316,7 +2316,7 @@ lpfc_fdmi_smart_attr_guid(struct lpfc_vport *vport, | |||
2316 | return size; | 2316 | return size; |
2317 | } | 2317 | } |
2318 | 2318 | ||
2319 | int | 2319 | static int |
2320 | lpfc_fdmi_smart_attr_version(struct lpfc_vport *vport, | 2320 | lpfc_fdmi_smart_attr_version(struct lpfc_vport *vport, |
2321 | struct lpfc_fdmi_attr_def *ad) | 2321 | struct lpfc_fdmi_attr_def *ad) |
2322 | { | 2322 | { |
@@ -2337,7 +2337,7 @@ lpfc_fdmi_smart_attr_version(struct lpfc_vport *vport, | |||
2337 | return size; | 2337 | return size; |
2338 | } | 2338 | } |
2339 | 2339 | ||
2340 | int | 2340 | static int |
2341 | lpfc_fdmi_smart_attr_model(struct lpfc_vport *vport, | 2341 | lpfc_fdmi_smart_attr_model(struct lpfc_vport *vport, |
2342 | struct lpfc_fdmi_attr_def *ad) | 2342 | struct lpfc_fdmi_attr_def *ad) |
2343 | { | 2343 | { |
@@ -2358,7 +2358,7 @@ lpfc_fdmi_smart_attr_model(struct lpfc_vport *vport, | |||
2358 | return size; | 2358 | return size; |
2359 | } | 2359 | } |
2360 | 2360 | ||
2361 | int | 2361 | static int |
2362 | lpfc_fdmi_smart_attr_port_info(struct lpfc_vport *vport, | 2362 | lpfc_fdmi_smart_attr_port_info(struct lpfc_vport *vport, |
2363 | struct lpfc_fdmi_attr_def *ad) | 2363 | struct lpfc_fdmi_attr_def *ad) |
2364 | { | 2364 | { |
@@ -2378,7 +2378,7 @@ lpfc_fdmi_smart_attr_port_info(struct lpfc_vport *vport, | |||
2378 | return size; | 2378 | return size; |
2379 | } | 2379 | } |
2380 | 2380 | ||
2381 | int | 2381 | static int |
2382 | lpfc_fdmi_smart_attr_qos(struct lpfc_vport *vport, | 2382 | lpfc_fdmi_smart_attr_qos(struct lpfc_vport *vport, |
2383 | struct lpfc_fdmi_attr_def *ad) | 2383 | struct lpfc_fdmi_attr_def *ad) |
2384 | { | 2384 | { |
@@ -2393,7 +2393,7 @@ lpfc_fdmi_smart_attr_qos(struct lpfc_vport *vport, | |||
2393 | return size; | 2393 | return size; |
2394 | } | 2394 | } |
2395 | 2395 | ||
2396 | int | 2396 | static int |
2397 | lpfc_fdmi_smart_attr_security(struct lpfc_vport *vport, | 2397 | lpfc_fdmi_smart_attr_security(struct lpfc_vport *vport, |
2398 | struct lpfc_fdmi_attr_def *ad) | 2398 | struct lpfc_fdmi_attr_def *ad) |
2399 | { | 2399 | { |
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index c0af32f24954..b7d54bfb1df9 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
@@ -4617,7 +4617,7 @@ lpfc_els_disc_plogi(struct lpfc_vport *vport) | |||
4617 | return sentplogi; | 4617 | return sentplogi; |
4618 | } | 4618 | } |
4619 | 4619 | ||
4620 | uint32_t | 4620 | static uint32_t |
4621 | lpfc_rdp_res_link_service(struct fc_rdp_link_service_desc *desc, | 4621 | lpfc_rdp_res_link_service(struct fc_rdp_link_service_desc *desc, |
4622 | uint32_t word0) | 4622 | uint32_t word0) |
4623 | { | 4623 | { |
@@ -4629,7 +4629,7 @@ lpfc_rdp_res_link_service(struct fc_rdp_link_service_desc *desc, | |||
4629 | return sizeof(struct fc_rdp_link_service_desc); | 4629 | return sizeof(struct fc_rdp_link_service_desc); |
4630 | } | 4630 | } |
4631 | 4631 | ||
4632 | uint32_t | 4632 | static uint32_t |
4633 | lpfc_rdp_res_sfp_desc(struct fc_rdp_sfp_desc *desc, | 4633 | lpfc_rdp_res_sfp_desc(struct fc_rdp_sfp_desc *desc, |
4634 | uint8_t *page_a0, uint8_t *page_a2) | 4634 | uint8_t *page_a0, uint8_t *page_a2) |
4635 | { | 4635 | { |
@@ -4694,7 +4694,7 @@ lpfc_rdp_res_sfp_desc(struct fc_rdp_sfp_desc *desc, | |||
4694 | return sizeof(struct fc_rdp_sfp_desc); | 4694 | return sizeof(struct fc_rdp_sfp_desc); |
4695 | } | 4695 | } |
4696 | 4696 | ||
4697 | uint32_t | 4697 | static uint32_t |
4698 | lpfc_rdp_res_link_error(struct fc_rdp_link_error_status_desc *desc, | 4698 | lpfc_rdp_res_link_error(struct fc_rdp_link_error_status_desc *desc, |
4699 | READ_LNK_VAR *stat) | 4699 | READ_LNK_VAR *stat) |
4700 | { | 4700 | { |
@@ -4723,7 +4723,7 @@ lpfc_rdp_res_link_error(struct fc_rdp_link_error_status_desc *desc, | |||
4723 | return sizeof(struct fc_rdp_link_error_status_desc); | 4723 | return sizeof(struct fc_rdp_link_error_status_desc); |
4724 | } | 4724 | } |
4725 | 4725 | ||
4726 | uint32_t | 4726 | static uint32_t |
4727 | lpfc_rdp_res_bbc_desc(struct fc_rdp_bbc_desc *desc, READ_LNK_VAR *stat, | 4727 | lpfc_rdp_res_bbc_desc(struct fc_rdp_bbc_desc *desc, READ_LNK_VAR *stat, |
4728 | struct lpfc_vport *vport) | 4728 | struct lpfc_vport *vport) |
4729 | { | 4729 | { |
@@ -4748,7 +4748,7 @@ lpfc_rdp_res_bbc_desc(struct fc_rdp_bbc_desc *desc, READ_LNK_VAR *stat, | |||
4748 | return sizeof(struct fc_rdp_bbc_desc); | 4748 | return sizeof(struct fc_rdp_bbc_desc); |
4749 | } | 4749 | } |
4750 | 4750 | ||
4751 | uint32_t | 4751 | static uint32_t |
4752 | lpfc_rdp_res_oed_temp_desc(struct lpfc_hba *phba, | 4752 | lpfc_rdp_res_oed_temp_desc(struct lpfc_hba *phba, |
4753 | struct fc_rdp_oed_sfp_desc *desc, uint8_t *page_a2) | 4753 | struct fc_rdp_oed_sfp_desc *desc, uint8_t *page_a2) |
4754 | { | 4754 | { |
@@ -4776,7 +4776,7 @@ lpfc_rdp_res_oed_temp_desc(struct lpfc_hba *phba, | |||
4776 | return sizeof(struct fc_rdp_oed_sfp_desc); | 4776 | return sizeof(struct fc_rdp_oed_sfp_desc); |
4777 | } | 4777 | } |
4778 | 4778 | ||
4779 | uint32_t | 4779 | static uint32_t |
4780 | lpfc_rdp_res_oed_voltage_desc(struct lpfc_hba *phba, | 4780 | lpfc_rdp_res_oed_voltage_desc(struct lpfc_hba *phba, |
4781 | struct fc_rdp_oed_sfp_desc *desc, | 4781 | struct fc_rdp_oed_sfp_desc *desc, |
4782 | uint8_t *page_a2) | 4782 | uint8_t *page_a2) |
@@ -4805,7 +4805,7 @@ lpfc_rdp_res_oed_voltage_desc(struct lpfc_hba *phba, | |||
4805 | return sizeof(struct fc_rdp_oed_sfp_desc); | 4805 | return sizeof(struct fc_rdp_oed_sfp_desc); |
4806 | } | 4806 | } |
4807 | 4807 | ||
4808 | uint32_t | 4808 | static uint32_t |
4809 | lpfc_rdp_res_oed_txbias_desc(struct lpfc_hba *phba, | 4809 | lpfc_rdp_res_oed_txbias_desc(struct lpfc_hba *phba, |
4810 | struct fc_rdp_oed_sfp_desc *desc, | 4810 | struct fc_rdp_oed_sfp_desc *desc, |
4811 | uint8_t *page_a2) | 4811 | uint8_t *page_a2) |
@@ -4834,7 +4834,7 @@ lpfc_rdp_res_oed_txbias_desc(struct lpfc_hba *phba, | |||
4834 | return sizeof(struct fc_rdp_oed_sfp_desc); | 4834 | return sizeof(struct fc_rdp_oed_sfp_desc); |
4835 | } | 4835 | } |
4836 | 4836 | ||
4837 | uint32_t | 4837 | static uint32_t |
4838 | lpfc_rdp_res_oed_txpower_desc(struct lpfc_hba *phba, | 4838 | lpfc_rdp_res_oed_txpower_desc(struct lpfc_hba *phba, |
4839 | struct fc_rdp_oed_sfp_desc *desc, | 4839 | struct fc_rdp_oed_sfp_desc *desc, |
4840 | uint8_t *page_a2) | 4840 | uint8_t *page_a2) |
@@ -4864,7 +4864,7 @@ lpfc_rdp_res_oed_txpower_desc(struct lpfc_hba *phba, | |||
4864 | } | 4864 | } |
4865 | 4865 | ||
4866 | 4866 | ||
4867 | uint32_t | 4867 | static uint32_t |
4868 | lpfc_rdp_res_oed_rxpower_desc(struct lpfc_hba *phba, | 4868 | lpfc_rdp_res_oed_rxpower_desc(struct lpfc_hba *phba, |
4869 | struct fc_rdp_oed_sfp_desc *desc, | 4869 | struct fc_rdp_oed_sfp_desc *desc, |
4870 | uint8_t *page_a2) | 4870 | uint8_t *page_a2) |
@@ -4893,7 +4893,7 @@ lpfc_rdp_res_oed_rxpower_desc(struct lpfc_hba *phba, | |||
4893 | return sizeof(struct fc_rdp_oed_sfp_desc); | 4893 | return sizeof(struct fc_rdp_oed_sfp_desc); |
4894 | } | 4894 | } |
4895 | 4895 | ||
4896 | uint32_t | 4896 | static uint32_t |
4897 | lpfc_rdp_res_opd_desc(struct fc_rdp_opd_sfp_desc *desc, | 4897 | lpfc_rdp_res_opd_desc(struct fc_rdp_opd_sfp_desc *desc, |
4898 | uint8_t *page_a0, struct lpfc_vport *vport) | 4898 | uint8_t *page_a0, struct lpfc_vport *vport) |
4899 | { | 4899 | { |
@@ -4907,7 +4907,7 @@ lpfc_rdp_res_opd_desc(struct fc_rdp_opd_sfp_desc *desc, | |||
4907 | return sizeof(struct fc_rdp_opd_sfp_desc); | 4907 | return sizeof(struct fc_rdp_opd_sfp_desc); |
4908 | } | 4908 | } |
4909 | 4909 | ||
4910 | uint32_t | 4910 | static uint32_t |
4911 | lpfc_rdp_res_fec_desc(struct fc_fec_rdp_desc *desc, READ_LNK_VAR *stat) | 4911 | lpfc_rdp_res_fec_desc(struct fc_fec_rdp_desc *desc, READ_LNK_VAR *stat) |
4912 | { | 4912 | { |
4913 | if (bf_get(lpfc_read_link_stat_gec2, stat) == 0) | 4913 | if (bf_get(lpfc_read_link_stat_gec2, stat) == 0) |
@@ -4924,7 +4924,7 @@ lpfc_rdp_res_fec_desc(struct fc_fec_rdp_desc *desc, READ_LNK_VAR *stat) | |||
4924 | return sizeof(struct fc_fec_rdp_desc); | 4924 | return sizeof(struct fc_fec_rdp_desc); |
4925 | } | 4925 | } |
4926 | 4926 | ||
4927 | uint32_t | 4927 | static uint32_t |
4928 | lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba) | 4928 | lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba) |
4929 | { | 4929 | { |
4930 | uint16_t rdp_cap = 0; | 4930 | uint16_t rdp_cap = 0; |
@@ -4986,7 +4986,7 @@ lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba) | |||
4986 | return sizeof(struct fc_rdp_port_speed_desc); | 4986 | return sizeof(struct fc_rdp_port_speed_desc); |
4987 | } | 4987 | } |
4988 | 4988 | ||
4989 | uint32_t | 4989 | static uint32_t |
4990 | lpfc_rdp_res_diag_port_names(struct fc_rdp_port_name_desc *desc, | 4990 | lpfc_rdp_res_diag_port_names(struct fc_rdp_port_name_desc *desc, |
4991 | struct lpfc_hba *phba) | 4991 | struct lpfc_hba *phba) |
4992 | { | 4992 | { |
@@ -5003,7 +5003,7 @@ lpfc_rdp_res_diag_port_names(struct fc_rdp_port_name_desc *desc, | |||
5003 | return sizeof(struct fc_rdp_port_name_desc); | 5003 | return sizeof(struct fc_rdp_port_name_desc); |
5004 | } | 5004 | } |
5005 | 5005 | ||
5006 | uint32_t | 5006 | static uint32_t |
5007 | lpfc_rdp_res_attach_port_names(struct fc_rdp_port_name_desc *desc, | 5007 | lpfc_rdp_res_attach_port_names(struct fc_rdp_port_name_desc *desc, |
5008 | struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) | 5008 | struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) |
5009 | { | 5009 | { |
@@ -5027,7 +5027,7 @@ lpfc_rdp_res_attach_port_names(struct fc_rdp_port_name_desc *desc, | |||
5027 | return sizeof(struct fc_rdp_port_name_desc); | 5027 | return sizeof(struct fc_rdp_port_name_desc); |
5028 | } | 5028 | } |
5029 | 5029 | ||
5030 | void | 5030 | static void |
5031 | lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, | 5031 | lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, |
5032 | int status) | 5032 | int status) |
5033 | { | 5033 | { |
@@ -5165,7 +5165,7 @@ free_rdp_context: | |||
5165 | kfree(rdp_context); | 5165 | kfree(rdp_context); |
5166 | } | 5166 | } |
5167 | 5167 | ||
5168 | int | 5168 | static int |
5169 | lpfc_get_rdp_info(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context) | 5169 | lpfc_get_rdp_info(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context) |
5170 | { | 5170 | { |
5171 | LPFC_MBOXQ_t *mbox = NULL; | 5171 | LPFC_MBOXQ_t *mbox = NULL; |
@@ -7995,7 +7995,7 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
7995 | } | 7995 | } |
7996 | } | 7996 | } |
7997 | 7997 | ||
7998 | void | 7998 | static void |
7999 | lpfc_start_fdmi(struct lpfc_vport *vport) | 7999 | lpfc_start_fdmi(struct lpfc_vport *vport) |
8000 | { | 8000 | { |
8001 | struct lpfc_hba *phba = vport->phba; | 8001 | struct lpfc_hba *phba = vport->phba; |
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c index 12dbe99ccc50..b234c50c255f 100644 --- a/drivers/scsi/lpfc/lpfc_mbox.c +++ b/drivers/scsi/lpfc/lpfc_mbox.c | |||
@@ -2260,7 +2260,7 @@ lpfc_sli4_dump_cfg_rg23(struct lpfc_hba *phba, struct lpfcMboxq *mbox) | |||
2260 | return 0; | 2260 | return 0; |
2261 | } | 2261 | } |
2262 | 2262 | ||
2263 | void | 2263 | static void |
2264 | lpfc_mbx_cmpl_rdp_link_stat(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) | 2264 | lpfc_mbx_cmpl_rdp_link_stat(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) |
2265 | { | 2265 | { |
2266 | MAILBOX_t *mb; | 2266 | MAILBOX_t *mb; |
@@ -2281,7 +2281,7 @@ mbx_failed: | |||
2281 | rdp_context->cmpl(phba, rdp_context, rc); | 2281 | rdp_context->cmpl(phba, rdp_context, rc); |
2282 | } | 2282 | } |
2283 | 2283 | ||
2284 | void | 2284 | static void |
2285 | lpfc_mbx_cmpl_rdp_page_a2(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox) | 2285 | lpfc_mbx_cmpl_rdp_page_a2(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox) |
2286 | { | 2286 | { |
2287 | struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) mbox->context1; | 2287 | struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) mbox->context1; |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 7080ce2920fd..c5326055beee 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -5689,7 +5689,7 @@ lpfc_sli4_dealloc_extent(struct lpfc_hba *phba, uint16_t type) | |||
5689 | return rc; | 5689 | return rc; |
5690 | } | 5690 | } |
5691 | 5691 | ||
5692 | void | 5692 | static void |
5693 | lpfc_set_features(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox, | 5693 | lpfc_set_features(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox, |
5694 | uint32_t feature) | 5694 | uint32_t feature) |
5695 | { | 5695 | { |
@@ -8968,7 +8968,7 @@ lpfc_sli_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp) | |||
8968 | * Since ABORTS must go on the same WQ of the command they are | 8968 | * Since ABORTS must go on the same WQ of the command they are |
8969 | * aborting, we use command's fcp_wqidx. | 8969 | * aborting, we use command's fcp_wqidx. |
8970 | */ | 8970 | */ |
8971 | int | 8971 | static int |
8972 | lpfc_sli_calc_ring(struct lpfc_hba *phba, uint32_t ring_number, | 8972 | lpfc_sli_calc_ring(struct lpfc_hba *phba, uint32_t ring_number, |
8973 | struct lpfc_iocbq *piocb) | 8973 | struct lpfc_iocbq *piocb) |
8974 | { | 8974 | { |