Skip to content

Commit 22ace84

Browse files
committed
AOSCOS: mvsas: Rename .device_configure() into .sdev_configure()
Following upstream name changes. Fixes: 47c2e30 ("scsi: Rename .device_configure() into .sdev_configure()") Fixes: "AOSCOS: mvsas: Optimise performance and stability on CPU_LOONGSON64" Signed-off-by: Kexy Biscuit <[email protected]>
1 parent 5eb40c3 commit 22ace84

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/scsi/mvsas/mv_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static const struct attribute_group *mvst_sdev_groups[];
3636

3737
static const struct scsi_host_template mvs_sht = {
3838
LIBSAS_SHT_BASE
39-
.device_configure = mvs_device_configure,
39+
.sdev_configure = mvs_sdev_configure,
4040
.scan_finished = mvs_scan_finished,
4141
.scan_start = mvs_scan_start,
4242
.can_queue = 1,

drivers/scsi/mvsas/mv_sas.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,11 @@ static void mvs_bytes_dmaed(struct mvs_info *mvi, int i, gfp_t gfp_flags)
255255
sas_notify_port_event(sas_phy, PORTE_BYTES_DMAED, gfp_flags);
256256
}
257257

258-
int mvs_device_configure(struct scsi_device *sdev, struct queue_limits *lim)
258+
int mvs_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
259259
{
260260
struct domain_device *dev = sdev_to_domain_dev(sdev);
261261

262-
sas_device_configure(sdev, lim);
262+
sas_sdev_configure(sdev, lim);
263263

264264
#if defined(CONFIG_MIPS) && defined(CONFIG_CPU_LOONGSON64)
265265
if (!dev_is_sata(dev))

drivers/scsi/mvsas/mv_sas.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
429429
void *funcdata);
430430
void mvs_set_sas_addr(struct mvs_info *mvi, int port_id, u32 off_lo,
431431
u32 off_hi, u64 sas_addr);
432-
int mvs_device_configure(struct scsi_device *sdev, struct queue_limits *lim);
432+
int mvs_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim);
433433
void mvs_scan_start(struct Scsi_Host *shost);
434434
int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);
435435
int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags);

0 commit comments

Comments
 (0)