Skip to content

Commit 3f1e2e9

Browse files
Luben Tuikovalexdeucher
authored andcommitted
drm/amdgpu: Nerf "buff" to "buf"
Buffer is abbreviated "buf" (buf-fer), not "buff" (buff-er). This is consistent with the rest of the kernel code. Cc: Kent Russell <kent.russell@amd.com> Cc: Alex Deucher <Alexander.Deucher@amd.com> Signed-off-by: Luben Tuikov <luben.tuikov@amd.com> Acked-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com> Reviewed-by: Kent Russell <kent.russell@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 692996f commit 3f1e2e9

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev)
7777
}
7878

7979
static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,
80-
unsigned char *buff)
80+
unsigned char *buf)
8181
{
8282
int ret, size;
8383

84-
ret = amdgpu_eeprom_read(adev->pm.fru_eeprom_i2c_bus, addrptr, buff, 1);
84+
ret = amdgpu_eeprom_read(adev->pm.fru_eeprom_i2c_bus, addrptr, buf, 1);
8585
if (ret < 1) {
8686
DRM_WARN("FRU: Failed to get size field");
8787
return ret;
@@ -90,9 +90,9 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,
9090
/* The size returned by the i2c requires subtraction of 0xC0 since the
9191
* size apparently always reports as 0xC0+actual size.
9292
*/
93-
size = buff[0] - I2C_PRODUCT_INFO_OFFSET;
93+
size = buf[0] - I2C_PRODUCT_INFO_OFFSET;
9494

95-
ret = amdgpu_eeprom_read(adev->pm.fru_eeprom_i2c_bus, addrptr + 1, buff, size);
95+
ret = amdgpu_eeprom_read(adev->pm.fru_eeprom_i2c_bus, addrptr + 1, buf, size);
9696
if (ret < 1) {
9797
DRM_WARN("FRU: Failed to get data field");
9898
return ret;
@@ -103,7 +103,7 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,
103103

104104
int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
105105
{
106-
unsigned char buff[AMDGPU_PRODUCT_NAME_LEN+2];
106+
unsigned char buf[AMDGPU_PRODUCT_NAME_LEN+2];
107107
u32 addrptr;
108108
int size, len;
109109
int offset = 2;
@@ -133,7 +133,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
133133
* and the language field, so just start from 0xb, manufacturer size
134134
*/
135135
addrptr = FRU_EEPROM_MADDR + 0xb;
136-
size = amdgpu_fru_read_eeprom(adev, addrptr, buff);
136+
size = amdgpu_fru_read_eeprom(adev, addrptr, buf);
137137
if (size < 1) {
138138
DRM_ERROR("Failed to read FRU Manufacturer, ret:%d", size);
139139
return -EINVAL;
@@ -143,7 +143,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
143143
* size field being 1 byte. This pattern continues below.
144144
*/
145145
addrptr += size + 1;
146-
size = amdgpu_fru_read_eeprom(adev, addrptr, buff);
146+
size = amdgpu_fru_read_eeprom(adev, addrptr, buf);
147147
if (size < 1) {
148148
DRM_ERROR("Failed to read FRU product name, ret:%d", size);
149149
return -EINVAL;
@@ -155,12 +155,12 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
155155
AMDGPU_PRODUCT_NAME_LEN);
156156
len = AMDGPU_PRODUCT_NAME_LEN - 1;
157157
}
158-
/* Start at 2 due to buff using fields 0 and 1 for the address */
159-
memcpy(adev->product_name, &buff[offset], len);
158+
/* Start at 2 due to buf using fields 0 and 1 for the address */
159+
memcpy(adev->product_name, &buf[offset], len);
160160
adev->product_name[len] = '\0';
161161

162162
addrptr += size + 1;
163-
size = amdgpu_fru_read_eeprom(adev, addrptr, buff);
163+
size = amdgpu_fru_read_eeprom(adev, addrptr, buf);
164164
if (size < 1) {
165165
DRM_ERROR("Failed to read FRU product number, ret:%d", size);
166166
return -EINVAL;
@@ -174,19 +174,19 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
174174
DRM_WARN("FRU Product Number is larger than 16 characters. This is likely a mistake");
175175
len = sizeof(adev->product_number) - 1;
176176
}
177-
memcpy(adev->product_number, &buff[offset], len);
177+
memcpy(adev->product_number, &buf[offset], len);
178178
adev->product_number[len] = '\0';
179179

180180
addrptr += size + 1;
181-
size = amdgpu_fru_read_eeprom(adev, addrptr, buff);
181+
size = amdgpu_fru_read_eeprom(adev, addrptr, buf);
182182

183183
if (size < 1) {
184184
DRM_ERROR("Failed to read FRU product version, ret:%d", size);
185185
return -EINVAL;
186186
}
187187

188188
addrptr += size + 1;
189-
size = amdgpu_fru_read_eeprom(adev, addrptr, buff);
189+
size = amdgpu_fru_read_eeprom(adev, addrptr, buf);
190190

191191
if (size < 1) {
192192
DRM_ERROR("Failed to read FRU serial number, ret:%d", size);
@@ -201,7 +201,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
201201
DRM_WARN("FRU Serial Number is larger than 16 characters. This is likely a mistake");
202202
len = sizeof(adev->serial) - 1;
203203
}
204-
memcpy(adev->serial, &buff[offset], len);
204+
memcpy(adev->serial, &buf[offset], len);
205205
adev->serial[len] = '\0';
206206

207207
return 0;

0 commit comments

Comments
 (0)