Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rsxx: Changing the adapter name to the official name.

Changing the adapter name from FlashSystem-80 to the official
name: Flash Adapter 900GB Full Height.

Signed-off-by: Philip J Kelleher <pjk1939@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Philip J Kelleher and committed by
Jens Axboe
f730e3dc fb065cd9

+8 -8
+1 -1
MAINTAINERS
··· 3297 3297 F: drivers/base/firmware*.c 3298 3298 F: include/linux/firmware.h 3299 3299 3300 - FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card) 3300 + FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card) 3301 3301 M: Joshua Morris <josh.h.morris@us.ibm.com> 3302 3302 M: Philip Kelleher <pjk1939@linux.vnet.ibm.com> 3303 3303 S: Maintained
+2 -2
drivers/block/Kconfig
··· 532 532 If unsure, say N. 533 533 534 534 config BLK_DEV_RSXX 535 - tristate "IBM FlashSystem 70/80 PCIe SSD Device Driver" 535 + tristate "IBM Flash Adapter 900GB Full Height PCIe Device Driver" 536 536 depends on PCI 537 537 help 538 538 Device driver for IBM's high speed PCIe SSD 539 - storage devices: FlashSystem-70 and FlashSystem-80. 539 + storage device: Flash Adapter 900GB Full Height. 540 540 541 541 To compile this driver as a module, choose M here: the 542 542 module will be called rsxx.
+5 -5
drivers/block/rsxx/core.c
··· 41 41 #define NO_LEGACY 0 42 42 #define SYNC_START_TIMEOUT (10 * 60) /* 10 minutes */ 43 43 44 - MODULE_DESCRIPTION("IBM FlashSystem 70/80 PCIe SSD Device Driver"); 44 + MODULE_DESCRIPTION("IBM Flash Adapter 900GB Full Height Device Driver"); 45 45 MODULE_AUTHOR("Joshua Morris/Philip Kelleher, IBM"); 46 46 MODULE_LICENSE("GPL"); 47 47 MODULE_VERSION(DRIVER_VERSION); ··· 336 336 int i; 337 337 int st; 338 338 339 - dev_warn(&dev->dev, "IBM FlashSystem PCI: preparing for slot reset.\n"); 339 + dev_warn(&dev->dev, "IBM Flash Adapter PCI: preparing for slot reset.\n"); 340 340 341 341 card->eeh_state = 1; 342 342 rsxx_mask_interrupts(card); ··· 376 376 int i; 377 377 int cnt = 0; 378 378 379 - dev_err(&dev->dev, "IBM FlashSystem PCI: disabling failed card.\n"); 379 + dev_err(&dev->dev, "IBM Flash Adapter PCI: disabling failed card.\n"); 380 380 381 381 card->eeh_state = 1; 382 382 card->halt = 1; ··· 450 450 int st; 451 451 452 452 dev_warn(&dev->dev, 453 - "IBM FlashSystem PCI: recovering from slot reset.\n"); 453 + "IBM Flash Adapter PCI: recovering from slot reset.\n"); 454 454 455 455 st = pci_enable_device(dev); 456 456 if (st) ··· 503 503 &card->ctrl[i].issue_dma_work); 504 504 } 505 505 506 - dev_info(&dev->dev, "IBM FlashSystem PCI: recovery complete.\n"); 506 + dev_info(&dev->dev, "IBM Flash Adapter PCI: recovery complete.\n"); 507 507 508 508 return PCI_ERS_RESULT_RECOVERED; 509 509